Changeset 671

Timestamp:

10/19/15 12:18:11 (9 years ago)

Author:

bas

Message:

finally finalized the trac wildcard address support, see #297

File:

• trunk/email2trac.py.in (modified) (4 diffs)

trunk/email2trac.py.in

@@ -1828 +1828 @@
     def parse_delivered_to_field(self, m, subject, spam_msg):
         """
+        See if we have replied to an existing ticket
         """
         self.logger.debug('function parse_delivered_to_field')
@@ -1854 +1855 @@
             id = "#%s" %(id)
 
-            if not self.ticket_update(m, id, spam_msg):
-                return False
+            ## true if ticket update
+            #
+            return self.ticket_update(m, id, spam_msg)
 
         except KeyError, detail:
@@ -1862 +1864 @@
             pass
 
-        return True
+        return False
+
 
     def parse_subject_field(self, m, subject, spam_msg):
@@ -2530 +2533 @@
             if self.parameters.notify_replyto_rewrite: 
 
-                self.logger.debug('\t Notify replyto rewrite set')
-
-                action, value = self.parameters.notify_replyto_rewrite.split(':')
-
-                if action in ['use_mail_domain']:
-                    self.logger.debug('\t\t use_mail_domain:%s' %value)
-                    tn.email2trac_replyto = '%s@%s' %(self.id, value)
-
-                elif action in ['use_trac_smtp_replyto']:
-                    self.logger.debug('\t\t use_trac_smtp_replyto delimiter:%s' %value)
+                self.logger.debug('\t Notify replyto rewrite set to:%s' %self.parameters.notify_replyto_rewrite)
+
+                if self.parameters.notify_replyto_rewrite in ['use_mail_domain']:
+                    self.logger.debug('\t\t use_mail_domain:%s' %self.smtp_default_domain)
+                    tn.email2trac_replyto = '%s@%s' %(self.id, self.smtp_default_domain )
+
+                elif self.parameters.notify_replyto_rewrite in ['use_trac_smtp_replyto']:
+                    self.logger.debug('\t\t use_trac_smtp_replyto delimiter:%s' %self.parameters.recipient_delimiter)
+
+                    ## handle addres with @ and without
+                    #
                     dummy = self.smtp_replyto.split('@')
                     if len(dummy) > 1:
-                        tn.email2trac_replyto = '%s%s%s@%s' %(dummy[0], value, self.id, dummy[1])
+                        tn.email2trac_replyto = '%s%s%s@%s' %(dummy[0], self.parameters.recipient_delimiter, self.id, dummy[1])
                     else:
-                        tn.email2trac_replyto = '%s%s%s' %(dummy[0], value, self.id)
+                        tn.email2trac_replyto = '%s%s%s' %(dummy[0], self.parameters.recipient_delimiter, self.id)
 
             if self.parameters.alternate_notify_template: