SF.net SVN: tmda: [2140] trunk/tmda-cgi

Revision: 2140
          http://svn.sourceforge.net/tmda/?rev=2140&view=rev
Author:   lack
Date:     2007-02-08 07:11:45 -0800 (Thu, 08 Feb 2007)

Log Message:
-----------
Fixed spam score column to read either 'score=...' or 'hits=...'

Modified Paths:
--------------
    trunk/tmda-cgi/PendList.py
    trunk/tmda-cgi/defaults.ini

Modified: trunk/tmda-cgi/PendList.py
===================================================================
--- trunk/tmda-cgi/PendList.py	2007-02-08 14:56:21 UTC (rev 2139)
+++ trunk/tmda-cgi/PendList.py	2007-02-08 15:11:45 UTC (rev 2140)
@@ -611,7 +611,7 @@
               SpamArray.append(0)
               Score = "-"
             else:
-              Score = Temp.group(1)
+              Score = Temp.group(2)
               if not float(Score) >= float(SpamThreshold):
                 SpamArray.append(0)
               else:

Modified: trunk/tmda-cgi/defaults.ini
===================================================================
--- trunk/tmda-cgi/defaults.ini	2007-02-08 14:56:21 UTC (rev 2139)
+++ trunk/tmda-cgi/defaults.ini	2007-02-08 15:11:45 UTC (rev 2140)
@@ -29,7 +29,7 @@
 Sendmail           =
 SpamCopFilter      =
 SpamScoreHeader    = x-spam-status
-SpamScoreRegEx     = .*hits=([0-9]+\.[0-9]).*
+SpamScoreRegEx     = .*(hits|score)=([0-9]+\.[0-9]).*
 UninstallBackupTGZ = TMDA_restore.tgz
 UninstallInstruct  = You will need to change the outgoing mail settings on your
   e-mail client. Please set your SMTP port to 25 (instead of 8025). Contact the


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.