Changeset 208

Timestamp:

05/30/08 09:58:55 (15 years ago)

Author:

bas

Message:

email2trac.py.in:

• implemented black_list option, closes #39

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (1 diff)

trunk/ChangeLog

@@ -54 +54 @@
     Applied by: Bas van der Vlies
 
+
+  * black_list  is now a configuration option and is used to deny
+    email addesses, default value is: MAILER-DAEMON@
+
+    Can specifiy more then one email adress seperated by ',', eg:
+    black_list : basv@sara.nl, walter@sara.nl
+
+    closes #39
+    
+    Author: Bas van der Vlies
     
 

trunk/email2trac.py.in

@@ -293 +293 @@
                         black_list = 'MAILER-DAEMON@'
 
-                #print black_list
-
-                FROM_RE = re.compile(r"""
-                    MAILER-DAEMON@
-                    """, re.VERBOSE|re.IGNORECASE)
-                result =  FROM_RE.search(self.email_addr)
-                if result:
-                        return True
-                else:
-                        return False
+                black_list = string.split(black_list)   
+                if not black_list.count('MAILER-DAEMON@'):
+                        black_list.append('MAILER-DAEMON@')
+
+                for entry in black_list:        
+                        FROM_RE = re.compile(entry, re.VERBOSE|re.IGNORECASE)
+                        result =  FROM_RE.search(self.email_addr)
+                        if result:
+                                return True
+
+                return False
 
         def email_to_unicode(self, message_str):