Added reply-to option to send_template_mail

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

diff --git a/forum/templatetags/email_tags.py b/forum/templatetags/email_tags.py
index 0a60594c8b20750d343dcf3baaf9c170bef0f76e..fcc948e29765aebab3e01e49d2fd9d73456eb2c2 100644 (file)
--- a/forum/templatetags/email_tags.py
+++ b/forum/templatetags/email_tags.py
@@ -20,7 +20,7 @@ class MultiUserMailMessage(template.Node):
             self.nodelist.render(context)
             messages.append((recipient, context['subject'], context['htmlcontent'], context['textcontent'], context['embeddedmedia']))
         
             self.nodelist.render(context)
             messages.append((recipient, context['subject'], context['htmlcontent'], context['textcontent'], context['embeddedmedia']))
         

-        create_and_send_mail_messages(messages,context['sender'])
+        create_and_send_mail_messages(messages, sender_data=context['sender'], reply_to=context['reply_to'])

 
 @register.tag
 def email(parser, token):
 
 @register.tag
 def email(parser, token):

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 115fc10ba8a562f2f0a77e4b3904711296891ee3..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
 
 from forum.utils.html2text import HTML2Text
 from threading import Thread
 

-def send_template_email(recipients, template, context, sender=None):
+def send_template_email(recipients, template, context, sender=None, reply_to = None):

     t = loader.get_template(template)
     t = loader.get_template(template)

-    context.update(dict(recipients=recipients, settings=settings, sender=sender))
+    context.update(dict(recipients=recipients, settings=settings, sender=sender, reply_to=reply_to))

     t.render(Context(context))
 
 def create_connection():
     t.render(Context(context))
 
 def create_connection():


@@ -44,7 +44,7 @@ def create_connection():
     return connection
 
 
     return connection
 
 

-def create_and_send_mail_messages(messages, sender_data=None):
+def create_and_send_mail_messages(messages, sender_data=None, reply_to=None):

     if not settings.EMAIL_HOST:
         return
 
     if not settings.EMAIL_HOST:
         return
 


@@ -58,7 +58,10 @@ def create_and_send_mail_messages(messages, sender_data=None):
         sender = u'%s <%s>' % (unicode(sender_data['name']), unicode(sender_data['email']))
         
     
         sender = u'%s <%s>' % (unicode(sender_data['name']), unicode(sender_data['email']))
         
     

-    reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)
+    if reply_to == None:
+        reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)
+    else:
+        reply_to = unicode(reply_to)

 
     try:
         connection = None
 
     try:
         connection = None