Ticket #3057: bcc.patch

trac/ticket/notification.py

@@ -183 +183 @@
             for author,ticket in cursor:
                 torecipients.append(author)
 
-        # Add smtp_always_cc address
-        acc = self.config.get('notification', 'smtp_always_cc')
-        if acc:
-            ccrecipients += acc.replace(',', ' ').split()
-
         return (torecipients, ccrecipients)
 
     def get_message_id(self, rcpt, modtime=0):

trac/notification.py

@@ -50 +50 @@
         """Reply-To address to use in notification emails.""")
 
     smtp_always_cc = Option('notification', 'smtp_always_cc', '',
-        """Email address(es) to always send notifications to.""")
+        """Email address(es) to always send notifications to,
+           addresses can be see by all recipients (Cc:).""")
 
+    smtp_always_bcc = Option('notification', 'smtp_always_bcc', '',
+        """Email address(es) to always send notifications to,
+           addresses do not appear publicly (Bcc:). (''since 0.10'').""")
+
     mime_encoding = Option('notification', 'mime_encoding', 'base64',
         """Specify the MIME encoding scheme for emails (''since 0.10'').""")
 
-    allow_public_cc = BoolOption('notification', 'allow_public_cc', 'false',
-        """Recipients can see email addresses of other CC'ed recipients
-        (''since 0.10'').""")
+    use_public_cc = BoolOption('notification', 'use_public_cc', 'false',
+        """Recipients can see email addresses of other CC'ed recipients.
+           (''since 0.10'').""")
 
-    maxheaderlen = Option('notification', 'maxheaderlen', '78')
+    maxheaderlen = Option('notification', 'maxheaderlen', '78',
+        """Maximum length of SMTP headers. (''since 0.10'').""")
 
 
 class Notify(object):
@@ -243 +249 @@
         from email.Utils import formatdate, formataddr
         body = self.hdf.render(self.template_name)
         projname = self.config.get('project', 'name')
-        public_cc = self.config.getbool('notification', 'allow_public_cc')
+        public_cc = self.config.getbool('notification', 'use_public_cc')
         headers = {}
         headers['X-Mailer'] = 'Trac %s, by Edgewall Software' % __version__
         headers['X-Trac-Version'] =  __version__
@@ -253 +259 @@
         headers['From'] = (projname, self.from_email)
         headers['Sender'] = self.from_email
         headers['Reply-To'] = self.replyto_email
-        # Format and remove invalid addresses
-        toaddrs = filter(lambda x: x, \
-                         [self.get_smtp_address(addr) for addr in torcpts])
-        ccaddrs = filter(lambda x: x, \
-                         [self.get_smtp_address(addr) for addr in ccrcpts])
-        # Remove duplicates
-        totmp = []
-        cctmp = []
-        for addr in toaddrs:
-            if addr not in totmp:
-                totmp.append(addr)
-        for addr in [c for c in ccaddrs if c not in totmp]:
-            if addr not in cctmp:
-                cctmp.append(addr)
-        (toaddrs, ccaddrs) = (totmp, cctmp)
+
+        def build_addresses(rcpts):
+            """Format and remove invalid addresses"""
+            return filter(lambda x: x, \
+                          [self.get_smtp_address(addr) for addr in rcpts])
+
+        def remove_dup(rcpts, all):
+            """Remove duplicates"""
+            tmp = []
+            for rcpt in rcpts:
+                if not rcpt in all:
+                    tmp.append(rcpt)
+                    all.append(rcpt)
+            return (tmp, all)
+
+        toaddrs = build_addresses(torcpts)
+        ccaddrs = build_addresses(ccrcpts)
+        accparam = self.config.get('notification', 'smtp_always_cc')
+        accaddrs = accparam and \
+                   build_addresses(accparam.replace(',', ' ').split()) or []
+        bccparam = self.config.get('notification', 'smtp_always_bcc')
+        bccaddrs = bccparam and \
+                   build_addresses(bccparam.replace(',', ' ').split()) or []
+
+        recipients = []
+        (toaddrs, recipients) = remove_dup(toaddrs, recipients)
+        (ccaddrs, recipients) = remove_dup(ccaddrs, recipients)
+        (accaddrs, recipients) = remove_dup(accaddrs, recipients)
+        (bccaddrs, recipients) = remove_dup(bccaddrs, recipients)
+
+        pcc = accaddrs
+        if public_cc:
+            pcc += ccaddrs
         if toaddrs:
             headers['To'] = ', '.join(toaddrs)
-        if public_cc:
-            headers['Cc'] = ', '.join(ccaddrs)
+        if pcc:
+            headers['Cc'] = ', '.join(pcc)
         headers['Date'] = formatdate()
         charset = 'utf-8'
         if not self._pref_encoding:
@@ -290 +314 @@
         msg.set_charset(self._charset)
         self.add_headers(msg, headers);
         self.add_headers(msg, mime_headers);
-        recipients = toaddrs + ccaddrs
         self.env.log.debug("Sending SMTP notification to %s on port %d to %s"
                            % (self.smtp_server, self.smtp_port, recipients))
         msgtext = msg.as_string()