Commit 4378fdb3 authored by Julien Muchembled's avatar Julien Muchembled

Let Python escape filenames of attachments in emails.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24259 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c05bf3f5
...@@ -135,10 +135,8 @@ def buildEmailMessage(from_url, to_url, msg=None, ...@@ -135,10 +135,8 @@ def buildEmailMessage(from_url, to_url, msg=None,
message.add_header('To', to_url) message.add_header('To', to_url)
for attachment in attachment_list: for attachment in attachment_list:
if attachment.has_key('name'): attachment_name = attachment.get('name', '')
attachment_name = attachment['name']
else:
attachment_name = ''
# try to guess the mime type # try to guess the mime type
if not attachment.has_key('mime_type'): if not attachment.has_key('mime_type'):
type, encoding = guess_type( attachment_name ) type, encoding = guess_type( attachment_name )
...@@ -164,8 +162,8 @@ def buildEmailMessage(from_url, to_url, msg=None, ...@@ -164,8 +162,8 @@ def buildEmailMessage(from_url, to_url, msg=None,
part.set_payload(attachment['content']) part.set_payload(attachment['content'])
Encoders.encode_base64(part) Encoders.encode_base64(part)
part.add_header('Content-Disposition', part.add_header('Content-Disposition', 'attachment',
'attachment; filename=%s' % attachment_name) filename=attachment_name)
part.add_header('Content-ID', '<%s>' % \ part.add_header('Content-ID', '<%s>' % \
''.join(['%s' % ord(i) for i in attachment_name])) ''.join(['%s' % ord(i) for i in attachment_name]))
message.attach(part) message.attach(part)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment