extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-06-13 21:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed issue #25 - unknown charsets on incoming email caused problems. This

Browse Source 
fix causes multiple charsets to be used in decoding to avoid this problem. 
  Thank you to Paul Boehm for the patch.
This commit is contained in:
Ross Poulton 2008-11-18 00:24:37 +00:00
parent 77f3e71bd9
commit d5d692db45
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
management/commands/get_email.py
View File

@ -106,14 +106,26 @@ def process_queue(q):
server.logout() server.logout()
def decodeUnknown(charset, string):
if not charset:
try:
string = string.decode('utf-8')
except:
string = string.decode('iso8859-1')
string = unicode(string)
return string
def ticket_from_message(message, queue): def ticket_from_message(message, queue):
# 'message' must be an RFC822 formatted message. # 'message' must be an RFC822 formatted message.
msg = message msg = message
message = email.message_from_string(msg) message = email.message_from_string(msg)
subject = message.get('subject', _('Created from e-mail')) subject = message.get('subject', _('Created from e-mail'))
subject = decodeUnknown(message.get_charset(), subject)
subject = subject.replace("Re: ", "").replace("Fw: ", "").strip() subject = subject.replace("Re: ", "").replace("Fw: ", "").strip()
sender = message.get('from', _('Unknown Sender')) sender = message.get('from', _('Unknown Sender'))
sender = decodeUnknown(message.get_charset(), sender)
sender_email = parseaddr(sender)[1] sender_email = parseaddr(sender)[1]
@ -138,7 +150,8 @@ def ticket_from_message(message, queue):
name = part.get_param("name") name = part.get_param("name")
if part.get_content_maintype() == 'text' and name == None: if part.get_content_maintype() == 'text' and name == None:
body = part.get_payload() body = part.get_payload(decode=True)
body = decodeUnknown(part.get_charset(), body)
else: else:
if not name: if not name:
ext = mimetypes.guess_extension(part.get_content_type()) ext = mimetypes.guess_extension(part.get_content_type())