Merge pull request #49 from udacity/login_logout_links

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

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 370e0f9c9259dd20e040f6126c9ed7810c504c05..b6081ae2339efdb3c1a8cecc101fd19fa7749723 100644 (file)
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -24,9 +24,9 @@ from forum.context import application_settings
 from forum.utils.html2text import HTML2Text
 from threading import Thread
 
-def send_template_email(recipients, template, context):
+def send_template_email(recipients, template, context, sender=None, reply_to = None):
     t = loader.get_template(template)
-    context.update(dict(recipients=recipients, settings=settings))
+    context.update(dict(recipients=recipients, settings=settings, sender=sender, reply_to=reply_to))
     t.render(Context(context))
 
 def create_connection():
@@ -44,15 +44,24 @@ def create_connection():
     return connection
 
 
-def create_and_send_mail_messages(messages):
+def create_and_send_mail_messages(messages, sender_data=None, reply_to=None):
     if not settings.EMAIL_HOST:
         return
 
     sender = Header(unicode(settings.APP_SHORT_NAME), 'utf-8')
-    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)
+    
+    if sender_data == None:
+        sender.append('<%s>' % unicode(settings.DEFAULT_FROM_EMAIL))
+        sender = u'%s <%s>' % (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
+    else:
+        sender.append('<%s>' % unicode(sender_data['email']))
+        sender = u'%s <%s>' % (unicode(sender_data['name']), unicode(sender_data['email']))
+        
+    
+    if reply_to == None:
+        reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)
+    else:
+        reply_to = unicode(reply_to)
 
     try:
         connection = None