github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't always use rfc6266 decoder.

Browse Source 
see #473
This commit is contained in:
Antoine Nguyen
2013-09-24 13:11:00 +02:00
parent 2fe441ecff
commit 084004c0fc
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/webmail/lib.py
+18 -16
View File
@@ -274,27 +274,29 @@ class ImapEmail(Email):
return None
def _find_attachments(self):
"""Retrieve attachments from the parsed body structure.
We try to find and decode a file name for each attachment. If
we failed, a generic name will be used (ie. part_1, part_2, ...).
"""
for att in self.bs.attachments:
attname = "part_%s" % att["pnum"]
params = None
key = None
if "params" in att and att["params"] != "NIL":
params = att["params"]
key = "name"
if key is None and "disposition" in att and len(att["disposition"]) > 1:
params = att["disposition"][1]
key = "filename"
if key and params:
for pos, value in enumerate(params):
if not value.startswith(key):
attname = u2u_decode.u2u_decode(att["params"][1]) \
.strip("\r\t\n")
elif "disposition" in att and len(att["disposition"]) > 1:
for pos, value in enumerate(att["disposition"][1]):
if not value.startswith("filename"):
continue
header = "%s; %s=%s" % (att['disposition'][0], value,
u2u_decode.u2u_decode(params[pos + 1]).strip("\r\t\n"))
header = "%s; %s=%s" \
% (att['disposition'][0],
value,
att["disposition"][1][pos + 1].strip("\r\t\n"))
attname = parse_headers(header).filename_unsafe
if attname is None:
attname = u2u_decode.u2u_decode(params[pos + 1]).strip("\r\t\n")
attname = u2u_decode.u2u_decode(
att["disposition"][1][pos + 1]
).strip("\r\t\n")
break
self.attachments[att["pnum"]] = attname
@@ -307,7 +309,7 @@ class ImapEmail(Email):
params["fname"] = os.path.join(settings.MEDIA_URL, fname)
if os.path.exists(path):
continue
pdef, content = self.imapc.fetchpart(self.mailid, self.mbox, params["pnum"])
fp = open(path, "wb")
fp.write(decode_payload(params["encoding"], content))