Changeset 301 for trunk

Timestamp:

01/11/10 15:13:53 (14 years ago)

Author:

bas

Message:

prevent mail loop, closes #172

Location:

trunk

Files:

• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (3 diffs)

trunk/debian/changelog

@@ -49 +49 @@
    Fixed by    : Bas van der Vlies
 
- * Prevent a mail loop for new tickets when ticket email address is set 
-   in CC and reply_all is set.
+ * Prevent mail loop. We could set the CC ticket field to 
+   the ticket email address.
+    - For a new ticket and reply_all is set.
+    - If the ticket CC field is updated via the subject line. 
+   closes #172
    Reported by: otto at bergerdata dot de
    Fixed vy   : Bas van der Vlies

trunk/email2trac.py.in

@@ -578 +578 @@
                            2) Set default value for field (use_default=1)
                 """
+                if self.DEBUG:
+                        print "TD: update_ticket_fields"
 
                 # Build a system dictionary from the ticket fields 
@@ -591 +593 @@
                                 pass
 
-                # Check user supplied fields an compare them with the
+                ## Check user supplied fields an compare them with the
                 # system one's
                 #
@@ -597 +599 @@
                         if self.DEBUG >= 10: 
                                 print  'user_field\t %s = %s' %(field,value)
+
+                        ## To prevent mail loop
+                        #
+                        if field == 'cc': 
+
+                                smtp_from = self.get_config('notification', 'smtp_from')
+
+                                cc_list = user_dict['cc'].split(',')
+
+                                if smtp_from in cc_list:
+                                        if self.DEBUG > 10:
+                                                print 'TD: MAIL LOOP: %s is not allowed as CC address' %(smtp_from)
+                                        cc_list.remove(smtp_from)
+
+                                value = ','.join(cc_list)
+                                
 
                         if sys_dict.has_key(field):