Merge cacheimp -> master

[osqa.git] / forum / utils / mail.py

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 0d281c234c626c5ce4fc9c0cef757a38965a2b6b..88b5f1881ca3ee1297f433f3cb541fcdf78bfdc8 100644 (file)
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -1,6 +1,7 @@
 import email
 import socket
 import os
+import logging
 
 try:
     from email.mime.multipart import MIMEMultipart
@@ -22,123 +23,6 @@ from forum.context import application_settings
 from forum.utils.html2text import HTML2Text
 from threading import Thread
 
-def send_msg_list(msgs, sender=None):
-    if len(msgs):
-        connection = SMTP(str(settings.EMAIL_HOST), str(settings.EMAIL_PORT),
-                          local_hostname=DNS_NAME.get_fqdn())
-
-        try:
-            if (bool(settings.EMAIL_USE_TLS)):
-                connection.ehlo()
-                connection.starttls()
-                connection.ehlo()
-
-            if settings.EMAIL_HOST_USER and settings.EMAIL_HOST_PASSWORD:
-                connection.login(str(settings.EMAIL_HOST_USER), str(settings.EMAIL_HOST_PASSWORD))
-
-            if sender is None:
-                sender = str(settings.DEFAULT_FROM_EMAIL)
-
-            for email, msg in msgs:
-                try:
-                    connection.sendmail(sender, [email], msg)
-                except Exception, e:
-                    pass
-            try:
-                connection.quit()
-            except socket.sslerror:
-                connection.close()
-        except Exception, e:
-            pass
-
-def html2text(s, ignore_tags=(), indent_width=4, page_width=80):
-    ignore_tags = [t.lower() for t in ignore_tags]
-    parser = HTML2Text(ignore_tags, indent_width, page_width)
-    parser.feed(s)
-    parser.close()
-    parser.generate()
-    return parser.result
-
-def named(data):
-    if isinstance(data, (tuple, list)) and len(data) == 2:
-        return '%s <%s>' % data
-
-    return str(data)
-
-def create_msg(subject, sender, recipient, html, text, images):
-    msgRoot = MIMEMultipart('related')
-    msgRoot['Subject'] = subject
-    msgRoot['From'] = named(sender)
-    msgRoot['To'] =  named(recipient)
-    msgRoot.preamble = 'This is a multi-part message from %s.' % unicode(settings.APP_SHORT_NAME).encode('utf8')
-
-    msgAlternative = MIMEMultipart('alternative')
-    msgRoot.attach(msgAlternative)
-
-    msgAlternative.attach(MIMEText(text, _charset='utf-8'))
-    msgAlternative.attach(MIMEText(html, 'html', _charset='utf-8'))
-
-    for img in images:
-        try:
-            fp = open(img[0], 'rb')
-            msgImage = MIMEImage(fp.read())
-            fp.close()
-            msgImage.add_header('Content-ID', '<'+img[1]+'>')
-            msgRoot.attach(msgImage)
-        except:
-            pass
-
-    return msgRoot.as_string()
-
-def send_email(subject, recipients, template, context={}, sender=None, images=[], threaded=True):
-    if sender is None:
-        sender = (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
-
-    if not len(images):
-        images = [(os.path.join(str(settings.UPFILES_FOLDER), os.path.basename(str(settings.APP_LOGO))), 'logo')]
-
-    context.update(application_settings(None))
-    html_body = loader.get_template(template).render(Context(context))
-    txt_body = html2text(html_body)
-
-    if isinstance(recipients, str):
-        recipients = [recipients]
-
-    msgs = []
-
-    for recipient in recipients:
-        if isinstance(recipient, str):
-            recipient_data = ('recipient', recipient)
-            recipient_context = None
-        elif isinstance(recipient, (list, tuple)) and len(recipient) == 2:
-            name, email = recipient
-            recipient_data = (name, email)
-            recipient_context = None
-        elif isinstance(recipient, (list, tuple)) and len(recipient) == 3:
-            name, email, recipient_context = recipient
-            recipient_data = (name, email)
-        else:
-            raise Exception('bad argument for recipients')
-
-        if recipient_context is not None:
-            recipient_context = Context(recipient_context)
-            msg_html = Template(html_body).render(recipient_context)
-            msg_txt = Template(txt_body).render(recipient_context)
-        else:
-            msg_html = html_body
-            msg_txt = txt_body
-
-        msg = create_msg(subject, sender, recipient_data, msg_html, msg_txt, images)
-        msgs.append((email, msg))
-
-    if threaded:
-        thread = Thread(target=send_msg_list, args=[msgs])
-        thread.setDaemon(True)
-        thread.start()
-    else:
-        send_msg_list(msgs)
-
-
 def send_template_email(recipients, template, context):
     t = loader.get_template(template)
     context.update(dict(recipients=recipients, settings=settings))
@@ -195,11 +79,11 @@ def create_and_send_mail_messages(messages):
             try:
                 connection.sendmail(sender, [recipient.email], msgRoot.as_string())
             except Exception, e:
-                pass
+                logging.error("Couldn't send mail using the sendmail method: %s" % e)
 
         try:
             connection.quit()
         except socket.sslerror:
             connection.close()
     except Exception, e:
-        pass
+        logging.error('Email sending has failed: %s' % e)