Changeset 207

Timestamp:

05/30/08 09:18:51 (16 years ago)

Author:

bas

Message:

email2trac.py.in:

• fixed a bug and made spam_header configurable, closes #63 and #64

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -41 +41 @@
 
     Author: Jim Meyering jim add meyering dot net
-    Implemented by: Bas van der Vlies
+    Applied by: Bas van der Vlies
+
+  * Made some approvements to spam function:
+     - If the he X-Spam-Score header is present, but has no value 
+        email2trac will crash, closes #63
+
+     - Added config option which header field we must check 
+       for determing if mail is Spam, eg:
+        - spam_header : X-Spam-Level (default: X-Spam-Score)
+ 
+    Author: email2trac at bulk dot squeakyblue dot com
+    Applied by: Bas van der Vlies
+
+    
 
 2008-02-04

trunk/email2trac.py.in

@@ -175 +175 @@
                         self.SPAM_LEVEL = 0
 
+                if parameters.has_key('spam_header'):
+                        self.SPAM_HEADER = parameters['spam_header']
+                else:
+                        self.SPAM_HEADER = 'X-Spam-Score'
+
                 if parameters.has_key('email_quote'):
                         self.EMAIL_QUOTE = str(parameters['email_quote'])
@@ -246 +251 @@
                 """
                 spam = False
-                if message.has_key('X-Spam-Score'):
-                        spam_l = string.split(message['X-Spam-Score'])
-                        number = spam_l[0].count('*')
-
+                if message.has_key(self.SPAM_HEADER):
+                        spam_l = string.split(message[self.SPAM_HEADER])
+
+                        try:
+                                number = spam_l[0].count('*')
+                        except IndexError, detail:
+                                number = 0
+                                
                         if number >= self.SPAM_LEVEL:
                                 spam = True