Adds an option to set a reply-to address on emails

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1209 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 583ab0d42f24d23fccbba88c3b216cbe56d7997e..7922385fc2f37fe49b05b0c2471add59b5088fa6 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -43,6 +43,11 @@ label = _("Site 'from' Email Address"),
 help_text = _("The address that will show up on the 'from' field on emails sent by your website."),\r
 required=False))\r
 \r
+DEFAULT_REPLY_TO_EMAIL = Setting('DEFAULT_REPLY_TO_EMAIL', '', EMAIL_SET, dict(\r
+label = _("Site 'reply-to' Email Address"),\r
+help_text = _("The address that will show up on the 'reply-to' field on emails sent by your website."),\r
+required=False))\r
+\r
 EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict(\r
 label = _("Email Subject Prefix"),\r
 help_text = _("Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easily set up a filter on their email clients."),\r

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 84a79b35a876297fd0e0e9c5bff6ac605074378c..cecb5b4c240b1961ae119ec4e07e85c47e1e0996 100644 (file)
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -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))
 
+    reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)
+
     try:
         connection = None
 
@@ -71,6 +73,9 @@ def create_and_send_mail_messages(messages):
             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')