resolves a typo in user suspend functionality, indefinetly should be indefinitely...

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

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 8016b0034701deb5f5faf3d3d3c9f866adf57a39..4ab2a695618902c031cf27ce8a707a3608111d27 100644 (file)
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -33,7 +33,7 @@ def create_connection():
     connection = SMTP(str(settings.EMAIL_HOST), str(settings.EMAIL_PORT),
                           local_hostname=DNS_NAME.get_fqdn())
 
     connection = SMTP(str(settings.EMAIL_HOST), str(settings.EMAIL_PORT),
                           local_hostname=DNS_NAME.get_fqdn())
 

-    if (bool(settings.EMAIL_USE_TLS)):
+    if bool(settings.EMAIL_USE_TLS):

         connection.ehlo()
         connection.starttls()
         connection.ehlo()
         connection.ehlo()
         connection.starttls()
         connection.ehlo()


@@ -52,6 +52,8 @@ def create_and_send_mail_messages(messages):
     sender.append('<%s>' % unicode(settings.DEFAULT_FROM_EMAIL))
     sender = u'%s <%s>' % (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
 
     sender.append('<%s>' % unicode(settings.DEFAULT_FROM_EMAIL))
     sender = u'%s <%s>' % (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
 

+    reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)
+

     try:
         connection = None
 
     try:
         connection = None
 


@@ -71,6 +73,9 @@ def create_and_send_mail_messages(messages):
             to.append('<%s>' % recipient.email)
             msgRoot['To'] = to
 
             to.append('<%s>' % recipient.email)
             msgRoot['To'] = to
 

+            if reply_to:
+                msgRoot['Reply-To'] = reply_to
+

             msgRoot.preamble = 'This is a multi-part message from %s.' % unicode(settings.APP_SHORT_NAME).encode('utf8')
 
             msgAlternative = MIMEMultipart('alternative')
             msgRoot.preamble = 'This is a multi-part message from %s.' % unicode(settings.APP_SHORT_NAME).encode('utf8')
 
             msgAlternative = MIMEMultipart('alternative')


@@ -94,12 +99,15 @@ def create_and_send_mail_messages(messages):
                 logging.error("Couldn't send mail using the sendmail method: %s" % e)
                 try:
                     connection.quit()
                 logging.error("Couldn't send mail using the sendmail method: %s" % e)
                 try:
                     connection.quit()

-                    connection = None
-                except Exception:
+                except Exception, e:
+                    logging.error(e)
+                finally:

                     connection = None
 
         try:
             connection.quit()
                     connection = None
 
         try:
             connection.quit()

+        except AttributeError:
+            pass

         except socket.sslerror:
             connection.close()
     except Exception, e:
         except socket.sslerror:
             connection.close()
     except Exception, e: