Changeset 304

Timestamp:

01/11/10 15:54:50 (13 years ago)

Author:

bas

Message:

Prevent setting the reporter to the ticket email address

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -52 +52 @@
     - For a new ticket and reply_all is set.
     - If the ticket CC field is updated via the subject line.
+
+   Also prevent setting the reporter address to the ticket email 
+   address.
+
    closes #172
    Reported by: otto at bergerdata dot de

trunk/debian/changelog

@@ -53 +53 @@
      - For a new ticket and reply_all is set.
      - If the ticket CC field is updated via the subject line. 
+
+    Also prevent setting the reporter address to the ticket email 
+    address.
+
     closes #172
     Reported by: otto at bergerdata dot de

trunk/email2trac.py.in

@@ -441 +441 @@
                 self.email_name, self.email_addr  = email.Utils.parseaddr(self.email_from)
 
-                # Trac can not handle author's name that contains spaces
-                #
-                self.author = self.email_addr
+                ## Trac can not handle author's name that contains spaces
+                #  and forbid the ticket email address as author field
+
+                if self.author == self.trac_smtp_from:
+                        self.author = "email2trac"
+                else:
+                        self.author = self.email_addr
 
                 if self.IGNORE_TRAC_USER_SETTINGS:
@@ -500 +504 @@
                                         pass
 
-                        ## This address is forbidden for CC-field, cuases mail-loop
-                        #
-                        smtp_from = self.get_config('notification', 'smtp_from')
-
                         for name,addr in cc_addrs:
                 
@@ -509 +509 @@
                                 #
                                 #if addr in to_list:
-                                if addr == smtp_from:
+
+                                if addr == self.trac_smtp_from:
                                         if self.DEBUG:
                                                 print "Skipping %s mail address for CC-field" %(addr)
@@ -604 +605 @@
                         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.trac_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)
+                                                print 'TD: MAIL LOOP: %s is not allowed as CC address' %(self.trac_smtp_from)
+                                        cc_list.remove(self.trac_smtp_from)
 
                                 value = ','.join(cc_list)
@@ -1000 +999 @@
                 else:
                         self.notification = 0
+
+                self.trac_smtp_from = self.get_config('notification', 'smtp_from')
 
                 # Check if  FullBlogPlugin is installed