Commit f6d4d5b8 authored by Jean-Paul Smets's avatar Jean-Paul Smets

Use buildEmailMessage from NotificationTool (buildEmailMessage was moved from...

Use buildEmailMessage from NotificationTool (buildEmailMessage was moved from Url.py to NotificationTool.py)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18560 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2bd58ed0
...@@ -30,14 +30,7 @@ from AccessControl import ClassSecurityInfo ...@@ -30,14 +30,7 @@ from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from Products.ERP5Type.Base import Base from Products.ERP5Type.Base import Base
from Products.ERP5.Document.Coordinate import Coordinate from Products.ERP5.Document.Coordinate import Coordinate
from cStringIO import StringIO from Products.ERP5.Tool.NotificationTool import buildEmailMessage
from mimetypes import guess_type
from email.MIMEMultipart import MIMEMultipart
from email.MIMEText import MIMEText
from email.MIMEBase import MIMEBase
from email.Header import make_header
from email import Encoders
no_crawl_protocol_list = ['mailto', 'javascript', ] no_crawl_protocol_list = ['mailto', 'javascript', ]
no_host_protocol_list = ['mailto', 'news', 'javascript',] no_host_protocol_list = ['mailto', 'news', 'javascript',]
...@@ -157,7 +150,6 @@ class Url(Coordinate, Base, UrlMixIn): ...@@ -157,7 +150,6 @@ class Url(Coordinate, Base, UrlMixIn):
mailhost = getattr(self.getPortalObject(), 'MailHost', None) mailhost = getattr(self.getPortalObject(), 'MailHost', None)
if mailhost is None: if mailhost is None:
raise AttributeError, "Cannot find a MailHost object" raise AttributeError, "Cannot find a MailHost object"
else:
if from_url is None: if from_url is None:
from_url = self.getUrlString(None) from_url = self.getUrlString(None)
if to_url is None: if to_url is None:
...@@ -165,51 +157,9 @@ class Url(Coordinate, Base, UrlMixIn): ...@@ -165,51 +157,9 @@ class Url(Coordinate, Base, UrlMixIn):
if from_url is None or to_url is None: if from_url is None or to_url is None:
raise AttributeError, "No mail defined" raise AttributeError, "No mail defined"
if attachment_list == None: message = buildEmailMessage(from_url, to_url, msg=msg,
# Create non multi-part MIME message. subject=subject, attachment_list=attachment_list,
message = MIMEText(msg, _charset='utf-8') extra_headers=extra_headers)
attachment_list = []
else:
# Create multi-part MIME message.
message = MIMEMultipart()
message.preamble = "If you can read this, your mailreader\n" \
"can not handle multi-part messages!\n"
message.attach(MIMEText(msg, _charset='utf-8'))
if extra_headers:
for k, v in extra_headers.items():
message.add_header('X-%s' % k, v)
message.add_header('Subject',
make_header([(subject, 'utf-8')]).encode())
message.add_header('From', from_url)
message.add_header('To', to_url)
for attachment in attachment_list:
if attachment.has_key('name'):
attachment_name = attachment['name']
else:
attachment_name = ''
# try to guess the mime type
if not attachment.has_key('mime_type'):
type, encoding = guess_type( attachment_name )
if type != None:
attachment['mime_type'] = type
else:
attachment['mime_type'] = 'application/octet-stream'
# attach it
if attachment['mime_type'] == 'text/plain':
part = MIMEText(attachment['content'], _charset='utf-8')
else:
# encode non-plaintext attachment in base64
part = MIMEBase(*attachment['mime_type'].split('/', 1))
part.set_payload(attachment['content'])
Encoders.encode_base64(part)
part.add_header('Content-Disposition',
'attachment; filename=%s' % attachment_name)
message.attach(part)
# send mail to user # send mail to user
mailhost.send(message.as_string(), to_url, from_url) mailhost.send(message.as_string(), to_url, from_url)
\ No newline at end of file
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