From 23e072dab0d77cfdaaa311602e3429fc4f371e56 Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 15 Oct 2010 20:11:27 +0200 Subject: [PATCH] fix: activate links by default to prevent an error when replying to an HTML message that contains images. --- extensions/webmail/lib.py | 4 +++- extensions/webmail/views.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index 323fef2c6..dae070a45 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -595,8 +595,10 @@ def find_images_in_body(body): parts = [] for tag in html.iter("img"): src = tag.get("src") + if src is None: + continue o = urlparse(src) - dirname = os.path.dirname(o.path).replace(settings.MEDIA_URL, "") + dirname = os.path.dirncme(o.path).replace(settings.MEDIA_URL, "") fname = os.path.basename(o.path) cid = "%s@modoboa" % os.path.splitext(fname)[0] tag.set("src", "cid:%s" % cid) diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py index c3a607052..7fbdd9a40 100644 --- a/extensions/webmail/views.py +++ b/extensions/webmail/views.py @@ -340,7 +340,7 @@ def reply(request, folder, mail_id): form = ComposeMailForm() email = ReplyModifier(msg, request.user, form, request.GET.has_key("full"), - addrfull=True) + addrfull=True, links="1") return render_compose(request, form, reverse(reply, args=[folder, mail_id]), email) @@ -358,6 +358,6 @@ def forward(request, folder, mail_id): msg = fetchmail(request, folder, mail_id, True) form = ComposeMailForm() - email = ForwardModifier(msg, request.user, form, addrfull=True) + email = ForwardModifier(msg, request.user, form, addrfull=True, links="1") return render_compose(request, form, reverse(forward, args=[folder, mail_id]), email)