Changeset 43

Timestamp:

01/26/06 13:48:25 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.pyt.in, email2trac.conf:

• Added reply_all option for ticket cc-field

Location:

emailtotracscript/trunk

Files:

• email2trac.conf (modified) (1 diff)
• email2trac.py.in (modified) (5 diffs)
• test7.eml (modified) (1 diff)

emailtotracscript/trunk/email2trac.conf

@@ -5 +5 @@
 spam_level: 4
 reply_address: 1
+reply_all : 1
 mailto_link: 1
 umask: 022

emailtotracscript/trunk/email2trac.py.in

@@ -140 +140 @@
                 else:
                         self.notify_template = None
+
+                if parameters.has_key('reply_all'):
+                        self.REPLY_ALL = int(parameters['reply_all'])
+                else:
+                        self.REPLY_ALL = 0
 
 
@@ -232 +237 @@
                 return str
 
+        def set_owner(self, ticket):
+                cursor = self.db.cursor()
+                sql = "SELECT owner FROM component WHERE name='%s'" % ticket['component']
+                cursor.execute(sql)
+                ticket['owner'] = cursor.fetchone()[0]
+
+
+        def set_reply_fields(self, ticket, message):
+                author, email_addr  = email.Utils.parseaddr(message['from'])
+                email_str = self.to_unicode(message['from'])
+
+                ticket['reporter'] = email_str
+                ticket['cc'] = None
+
+                # Put all addresses in ticket CC field
+                #
+                if self.REPLY_ALL:
+                        tos = message.get_all('to', [])
+                        ccs = message.get_all('cc', [])
+
+                        addrs = email.Utils.getaddresses(tos + ccs)
+
+                        # Remove reporter email address if notification is 
+                        # on
+                        #
+                        if self.notification:
+                                try:
+                                        addrs.remove((author, email_addr))
+                                except ValueError, detail:
+                                        pass
+
+                        for a,m in addrs:
+                                        if not ticket['cc']:
+                                                ticket['cc'] = m
+                                        else:
+                                                ticket['cc'] = '%s,%s' %(ticket['cc'], m)
+
+                # Put authors email addess in CC field only if notification is off
+                #
+                elif self.CC and not self.notification:
+                        ticket['cc'] = email_str
+
+                return author, email_addr
+
         def parse(self, fp):
                 msg = email.message_from_file(fp)
@@ -252 +301 @@
                 tkt['status'] = 'new'
 
+                if self.get_config('notification', 'smtp_enabled') in ['true']:
+                        self.notification = 1
+
                 # Some defaults
                 #
@@ -277 +329 @@
                 #       sys.exit(1)
 
-                # Get default owner for component
-                #
-                cursor = self.db.cursor()
-                sql = "SELECT owner FROM component WHERE name='%s'" % tkt['component']
-                cursor.execute(sql)
-                tkt['owner'] = cursor.fetchone()[0]
-
-                author, email_addr  = email.Utils.parseaddr(msg['from'])
-                email_str = self.to_unicode(msg['from'])
-                if author:
-                        tkt['reporter'] = email_str
-                else:
-                        tkt['reporter'] = email_str
-
-                if self.CC:
-                        tkt['cc'] = email_str
+                # Set default owner for component
+                #
+                self.set_owner(tkt)
+                author, email_addr = self.set_reply_fields(tkt, msg)
 
 # produce e-mail like header
@@ -350 +390 @@
 
                 self.attachments(msg, tkt, author)
-                if self.get_config('notification', 'smtp_enabled') in ['true']:
+                if self.notification:
                         self.notify(tkt)
 

emailtotracscript/trunk/test7.eml

@@ -16 +16 @@
 X-Accept-Language: en-us, en
 MIME-Version: 1.0
-To: "Walter de Jong" <walter@sara.nl>
+To: "Walter de Jong" <walter@sara.nl>, basv@sara.nl
 Subject: test #7
 Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="------------ms030807040502080509050606"