Changeset 671 for trunk/email2trac.py.in
- Timestamp:
- 10/19/15 12:18:11 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/email2trac.py.in
r669 r671 1828 1828 def parse_delivered_to_field(self, m, subject, spam_msg): 1829 1829 """ 1830 See if we have replied to an existing ticket 1830 1831 """ 1831 1832 self.logger.debug('function parse_delivered_to_field') … … 1854 1855 id = "#%s" %(id) 1855 1856 1856 if not self.ticket_update(m, id, spam_msg): 1857 return False 1857 ## true if ticket update 1858 # 1859 return self.ticket_update(m, id, spam_msg) 1858 1860 1859 1861 except KeyError, detail: … … 1862 1864 pass 1863 1865 1864 return True 1866 return False 1867 1865 1868 1866 1869 def parse_subject_field(self, m, subject, spam_msg): … … 2530 2533 if self.parameters.notify_replyto_rewrite: 2531 2534 2532 self.logger.debug('\t Notify replyto rewrite set') 2533 2534 action, value = self.parameters.notify_replyto_rewrite.split(':') 2535 2536 if action in ['use_mail_domain']: 2537 self.logger.debug('\t\t use_mail_domain:%s' %value) 2538 tn.email2trac_replyto = '%s@%s' %(self.id, value) 2539 2540 elif action in ['use_trac_smtp_replyto']: 2541 self.logger.debug('\t\t use_trac_smtp_replyto delimiter:%s' %value) 2535 self.logger.debug('\t Notify replyto rewrite set to:%s' %self.parameters.notify_replyto_rewrite) 2536 2537 if self.parameters.notify_replyto_rewrite in ['use_mail_domain']: 2538 self.logger.debug('\t\t use_mail_domain:%s' %self.smtp_default_domain) 2539 tn.email2trac_replyto = '%s@%s' %(self.id, self.smtp_default_domain ) 2540 2541 elif self.parameters.notify_replyto_rewrite in ['use_trac_smtp_replyto']: 2542 self.logger.debug('\t\t use_trac_smtp_replyto delimiter:%s' %self.parameters.recipient_delimiter) 2543 2544 ## handle addres with @ and without 2545 # 2542 2546 dummy = self.smtp_replyto.split('@') 2543 2547 if len(dummy) > 1: 2544 tn.email2trac_replyto = '%s%s%s@%s' %(dummy[0], value, self.id, dummy[1])2548 tn.email2trac_replyto = '%s%s%s@%s' %(dummy[0], self.parameters.recipient_delimiter, self.id, dummy[1]) 2545 2549 else: 2546 tn.email2trac_replyto = '%s%s%s' %(dummy[0], value, self.id)2550 tn.email2trac_replyto = '%s%s%s' %(dummy[0], self.parameters.recipient_delimiter, self.id) 2547 2551 2548 2552 if self.parameters.alternate_notify_template:
Note: See TracChangeset
for help on using the changeset viewer.