Allow non-admin email addresses as envelope sender.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4391 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/mailer.py b/roundup/mailer.py
index 171ec1133c8ebc12fc5a7a8bb5f99da64433241d..453a1ded0ed45c614eba34d5414bb0c6080e374a 100644 (file)
--- a/roundup/mailer.py
+++ b/roundup/mailer.py
@@ -177,17 +177,22 @@ class Mailer:
         content = '\n'.join(traceback.format_exception(*sys.exc_info()))
         self.standard_message(to, subject, content)
 
-    def smtp_send(self, to, message):
+    def smtp_send(self, to, message, sender=None):
         """Send a message over SMTP, using roundup's config.
 
         Arguments:
         - to: a list of addresses usable by rfc822.parseaddr().
         - message: a StringIO instance with a full message.
+        - sender: if not 'None', the email address to use as the
+        envelope sender.  If 'None', the admin email is used.
         """
+
+        if not sender:
+            sender = self.config.ADMIN_EMAIL
         if self.debug:
             # don't send - just write to a file
             open(self.debug, 'a').write('FROM: %s\nTO: %s\n%s\n' %
-                                        (self.config.ADMIN_EMAIL,
+                                        (sender,
                                          ', '.join(to), message))
         else:
             # now try to send the message
@@ -195,7 +200,7 @@ class Mailer:
                 # send the message as admin so bounces are sent there
                 # instead of to roundup
                 smtp = SMTPConnection(self.config)
-                smtp.sendmail(self.config.ADMIN_EMAIL, to, message)
+                smtp.sendmail(sender, to, message)
             except socket.error, value:
                 raise MessageSendError("Error: couldn't send email: "
                                        "mailhost %s"%value)