Changeset 636

Timestamp:

08/07/13 14:30:49 (10 years ago)

Author:

bas

Message:

ticket cc fields ignored on ticket update, closes #324

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (3 diffs)

trunk/ChangeLog

@@ -2 +2 @@
   * Also made delete_spam virtual env aware
     Fixed by: Bas van der Vlies
+
+  * cc_fields ignored existing ticket CC field on ticket update, closes #324
+    Author: tboudreau add us dot ntt dot net
+    Applied by: Bas van der Vlies
 
 2.7.0

trunk/email2trac.py.in

@@ -222 +222 @@
         self.smtp_default_domain = self.get_config('notification', 'smtp_default_domain')
         self.smtp_replyto = self.get_config('notification', 'smtp_replyto')
+        self.trac_smtp_always_cc = self.get_config('notification', 'smtp_always_cc')
+        self.trac_smtp_always_bcc = self.get_config('notification', 'smtp_always_bcc')
 
 
@@ -401 +403 @@
         if self.parameters.reply_all:
 
-            email_cc = ''
-
-            cc_addrs = email.Utils.getaddresses( message.get_all('cc', []) )
-
-            if not cc_addrs:
+            ticket_cc = ''
+
+            msg_cc_addrs = email.Utils.getaddresses( message.get_all('cc', []) )
+
+            if not msg_cc_addrs:
                 return
 
-            ## Build a list of forbidden CC addresses
-            #
-            #to_addrs = email.Utils.getaddresses( message.get_all('to', []) )
-            #to_list = list()
-            #for n,e in to_addrs:
-            #   to_list.append(e)
-
             if update:
-                self.logger.debug("\tupdate cc-fields")
-
-            for name,addr in cc_addrs:
+                self.logger.debug("\tupdate ticket cc-field")
+                ticket_cc = ticket['cc']
+                ticket_cc_list = ticket_cc.split(',')
+
+            for name,addr in msg_cc_addrs:
         
                 ## Prevent mail loop
@@ -432 +429 @@
                     continue
 
+                ## Always remove the always_cc address
+                #
+                elif addr == self.trac_smtp_always_cc:
+                    self.logger.debug("\tSkipping smtp_always_cc email address for CC-field")
+                    continue
+
+                ## Always remove the always_bcc address
+                #
+                elif addr == self.trac_smtp_always_bcc:
+                    self.logger.debug("\tSkipping smtp_always_bcc email address for CC-field")
+                    continue
+
                 else:
-                    if email_cc:
-                        email_cc = '%s, %s' %(email_cc, addr)
+                    ## On update, prevent adding duplicates
+                    #
+                    if update:
+                      if addr in ticket_cc_list:
+                          continue
+                    
+                    if ticket_cc:
+                        ticket_cc = '%s, %s' %(ticket_cc, addr)
                     else:
-                        email_cc = addr
-
-            if email_cc:
-                self.logger.debug('\tCC fields: %s' %email_cc)
-                ticket['cc'] = self.email_to_unicode(email_cc)
+                        ticket_cc = addr
+
+            if ticket_cc:
+                self.logger.debug('\tCC fields: %s' %ticket_cc)
+                ticket['cc'] = self.email_to_unicode(ticket_cc)