Changeset 9306

Timestamp:

7 Oct 2012, 08:32:45 (12 years ago)

Author:

Henrik Bettermann

Message:

Enable sending emails to several email addresses all the with the same rcpt_name (Import Manager, Clearance Officer ...).

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• smtp.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• tests/test_smtp.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/smtp.py

@@ -149 +149 @@
     return MIMEText(text, 'plain', charset)
 
-def send_mail(from_name, from_addr, rcpt_name, rcpt_addr,
+def send_mail(from_name, from_addr, rcpt_name, rcpt_addrs,
               subject, body, config=None):
     """Send mail.
     """
     # format message
+    rcpt_addrs = rcpt_addrs.replace(' ','').split(',')
+    body_to = ''
+    for email in rcpt_addrs:
+        body_to += '%s, ' % encode_address(email, rcpt_name)
     body = encode_body(body)
     body["From"] = encode_address(from_addr, from_name)
-    body["To"] = encode_address(rcpt_addr, rcpt_name)
+    body["To"] = body_to.strip(', ')
     body["Subject"] = encode_header_item(subject)
 
     mailer = getUtility(IMailService)
-    result = mailer().send(from_addr, [rcpt_addr], body.as_string())
+    result = mailer().send(from_addr, rcpt_addrs, body.as_string())
     return result

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1169 +1169 @@
         self.assertTrue(
             'You entered invalid credentials.' in self.browser.contents)
-        import pdb; pdb.set_trace()
         # We set the password again
         IUserAccount(

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py

@@ -45 +45 @@
 # Maybe existing receiver of externally sent mail. If this mail account
 # exists really, it might receive mail from the tests!
-EXTERNAL_MAIL_RECEIVER = 'no-user@waeup.org'
+EXTERNAL_MAIL_RECEIVER = 'no-reply@waeup.org'
 
 # Names of mail deliveries to use when external mail tests are enabled.
@@ -340 +340 @@
 
     @external_mail_test
+    def test_send_direct_mails(self):
+        # send several mails using direct mail delivery
+        self.app['configuration'].smtp_mailer = EXTERNAL_DIRECT_DELIVERY
+        setSite(self.app)
+        result = send_mail(
+            'test program', 'no-reply@waeup.org',
+            'test mail receiver',
+            '%s, %s' % (EXTERNAL_MAIL_RECEIVER, EXTERNAL_MAIL_RECEIVER),
+            'Test Mail from WAeUP Kofa',
+            'Hi from test mailer!\n\nRegards,\nTest Programme\n'
+            )
+        import transaction
+        transaction.commit() # The mail is really sent when transactions is
+                             # committed
+        self.assertTrue('@' in result)
+        return
+
+    @external_mail_test
     def test_send_queued_mail(self):
         # send mail using queued mail delivery