From 9bc2a84bca457fc80f734c96dffba6006e1a7d0c Mon Sep 17 00:00:00 2001 From: Simon Kern Date: Thu, 9 May 2013 12:58:04 +0200 Subject: [PATCH 1/4] fixed path in webmail/lib.py If you had moved your MEDIA_ROOT somewhere else, this wouldn't have worked probably. --- modoboa/extensions/webmail/lib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index 0bc18ef39..3d603fa28 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -291,9 +291,9 @@ class ImapEmail(Email): for cid, params in self.bs.inlines.iteritems(): if re.search("\.\.", cid): continue - fname = "media/webmail/%s_%s" % (self.mailid, cid) - path = os.path.join(settings.MODOBOA_DIR, fname) - params["fname"] = "/%s" % fname + fname = "webmail/%s_%s" % (self.mailid, cid) + path = os.path.join(settings.MEDIA_ROOT, fname) + params["fname"] = settings.MEDIA_URL/+"%s" % fname if os.path.exists(path): continue From b693bc82a9bdf9452277787cbddb64700a084891 Mon Sep 17 00:00:00 2001 From: Simon Kern Date: Thu, 9 May 2013 15:32:42 +0200 Subject: [PATCH 2/4] fixed typi --- modoboa/extensions/webmail/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index 3d603fa28..d8693c0b2 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -293,7 +293,7 @@ class ImapEmail(Email): continue fname = "webmail/%s_%s" % (self.mailid, cid) path = os.path.join(settings.MEDIA_ROOT, fname) - params["fname"] = settings.MEDIA_URL/+"%s" % fname + params["fname"] = settings.MEDIA_URL+"/%s" % fname if os.path.exists(path): continue From fd58218de730a8087444f9344e1132e3a469c881 Mon Sep 17 00:00:00 2001 From: Simon Kern Date: Thu, 9 May 2013 15:34:22 +0200 Subject: [PATCH 3/4] Revert "fixed typi" This reverts commit b693bc82a9bdf9452277787cbddb64700a084891. --- modoboa/extensions/webmail/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index d8693c0b2..3d603fa28 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -293,7 +293,7 @@ class ImapEmail(Email): continue fname = "webmail/%s_%s" % (self.mailid, cid) path = os.path.join(settings.MEDIA_ROOT, fname) - params["fname"] = settings.MEDIA_URL+"/%s" % fname + params["fname"] = settings.MEDIA_URL/+"%s" % fname if os.path.exists(path): continue From 88dc634b6e8ed0a364a52b87262c11cf5094237c Mon Sep 17 00:00:00 2001 From: Simon Kern Date: Thu, 9 May 2013 15:34:49 +0200 Subject: [PATCH 4/4] fixed typo --- modoboa/extensions/webmail/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index 3d603fa28..d8693c0b2 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -293,7 +293,7 @@ class ImapEmail(Email): continue fname = "webmail/%s_%s" % (self.mailid, cid) path = os.path.join(settings.MEDIA_ROOT, fname) - params["fname"] = settings.MEDIA_URL/+"%s" % fname + params["fname"] = settings.MEDIA_URL+"/%s" % fname if os.path.exists(path): continue