Changeset 518

Timestamp:

04/21/11 11:00:29 (12 years ago)

Author:

bas

Message:

Fixed comparison of email addresses and author names. Always do lower case comparison, closes #242

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -1 +1 @@
 2.X.X
+  * Convert all email addresses and author names to lower case in compare 
+    functions.  closes #242.
+    Author: Dennis McRitchie <dmcr add Princeton dot EDU >
+    Applied by: Bas van der Vlies
+
   * Added timestamp when log_file stderr or file is used. Move log level of 
     reporting subject line to info instead of debug, closes #236

trunk/debian/changelog

@@ +1 @@
+email2trac (2.0.3-2) stable; urgency=low
+
+  * see Changelog 
+
+ -- bas van der Vlies <basv@sara.nl>  Thu, 21 Apr 2011 10:54:37 +0200
+
 email2trac (2.0.3-1) stable; urgency=low
 
   * See ChangeLog 
 
- -- bas van der Vlies <bas@test3.irc.sara.nl.irc.sara.nl>  Wed, 23 Mar 2011 10:06:56 +0100
+ -- bas van der Vlies <basv@sara.nl>  Wed, 23 Mar 2011 10:06:56 +0100
 
 email2trac (2.0.2-1) stable; urgency=low

trunk/email2trac.py.in

@@ -326 +326 @@
         ## Trac can not handle author's name that contains spaces
         #
-        if self.email_addr == self.trac_smtp_from:
+        if self.email_addr.lower() == self.trac_smtp_from.lower():
             if self.email_name:
                 self.author = self.email_name
@@ -346 +346 @@
             if ( 
                 (e and (e.lower() == self.email_addr.lower())) or
-                (u + '@' + self.smtp_default_domain.lower() == self.email_addr.lower())
+                (u.lower() + '@' + self.smtp_default_domain.lower() == self.email_addr.lower())
             )
             ]
@@ -648 +648 @@
         self.logger.debug('function check_permission_participants')
 
-        if tkt['reporter'].lower() in [self.author, self.email_addr]:
+        if tkt['reporter'].lower() in [self.author.lower(), self.email_addr.lower()]:
             self.logger.debug('ALLOW, %s is the ticket reporter' %(self.email_addr))
 
@@ -663 +663 @@
             cc_list = tkt['cc'].split(',')
             for cc in cc_list:
-                if self.email_addr.lower() in cc.strip():
+                if self.email_addr.lower() in cc.lower.strip():
                     self.logger.debug('ALLOW, %s is in the CC' %(self.email_addr))