Changeset 16300 for main/waeup.kofa/trunk/src

Timestamp:

4 Nov 2020, 22:25:27 (4 years ago)

Author:

Henrik Bettermann

Message:

Configure Cc and Bcc properly.

Location:

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

Files:

• smtp.py (modified) (1 diff)
• students/browser.py (modified) (3 diffs)
• students/tests/test_browser.py (modified) (3 diffs)

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

@@ -189 +189 @@
     body["To"] = body_to.strip(', ')
     if cc:
-        body["Cc"] = cc
+        for item in cc:
+            body["Cc"] = '%s' % encode_address(item[0], item[1])
+            rcpt_addrs.append(item[0])
     if bcc:
-        body["Bcc"] = bcc
+        for item in bcc:
+            body["Bcc"] = '%s' % encode_address(item[0], item[1])
+            rcpt_addrs.append(item[0])
     body["Reply-To"] = reply_addr
     body["Subject"] = encode_header_item(subject)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -350 +350 @@
         entries.sort()
         deleted = []
-        emails_tobesent = ''
+        emails_tobesent = []
         for entry in entries:
             if 'remove' in form:
@@ -356 +356 @@
                 deleted.append(entry)
             if 'send_email' in form and self.context[entry].email:
-                emails_tobesent += '%s,' % encode_address(
+                emails_tobesent.append((
                     self.context[entry].email,
-                    self.context[entry].student_id)
+                    self.context[entry].student_id))
         if 'send_email' in form and not len(emails_tobesent):
             self.flash(_('No email address found.'), type="warning")
             return
         if len(emails_tobesent):
-            args = {'bcc_to': emails_tobesent.strip(',')}
+            args = {'bcc_to': emails_tobesent}
             self.redirect(self.url(self.context) +
                 '/send_bulk_email?%s' % urlencode(args))
@@ -570 +570 @@
                 self.config.name,
                 data['body'],data['subject'],
-                data['bcc_to'])
+                eval(data['bcc_to'])
+                )
         if success:
             self.flash(_('Your message has been sent.'))

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

@@ -476 +476 @@
         ctrl.getControl(value='K1000001').selected = True
         self.browser.getControl("Send bulk", index=0).click()
-        self.assertTrue('K1000000 <aa@aa.ng>,K1000001 <uli@uni.ng>'
+        self.assertTrue("[('aa@aa.ng', u'K1000000'), ('uli@uni.ng', u'K1000001')]"
             in self.browser.contents)
         self.browser.getControl(name="form.subject").value = 'Test'
@@ -483 +483 @@
         self.assertTrue('Your message has been sent' in self.browser.contents)
         self.assertMatches(
-        u'Sending email from no-reply@waeup.org to contact@waeup.org:\n'
+        u'Sending email from no-reply@waeup.org to contact@waeup.org, aa@aa.ng, uli@uni.ng:\n'
         u'Message:\n'
         u'msg: MIME-Version: 1.0\n'
@@ -490 +490 @@
         u'msg: From: Manager <no-reply@waeup.org>\n'
         u'msg: To: Manager <contact@waeup.org>\n'
-        u'msg: Bcc: K1000000 <aa@aa.ng>,K1000001 <uli@uni.ng>\n'
+        u'msg: Bcc: K0000000 <aa@aa.ng>\n'
+        u'msg: Bcc: K0000001 <uli@uni.ng>\n'
         u'msg: Reply-To: Manager <contact@waeup.org>\n'
         u'msg: Subject: Test\n'