SF.net SVN: tmda: [2181] branches/tmda-cgi-0.16/PendList.py

Revision: 2181
          http://svn.sourceforge.net/tmda/?rev=2181&view=rev
Author:   lack
Date:     2007-03-29 11:48:14 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Should remove any 'duplicate release on whiteliste' issues.

Modified Paths:
--------------
    branches/tmda-cgi-0.16/PendList.py

Modified: branches/tmda-cgi-0.16/PendList.py
===================================================================
--- branches/tmda-cgi-0.16/PendList.py	2007-03-29 16:34:09 UTC (rev 2180)
+++ branches/tmda-cgi-0.16/PendList.py	2007-03-29 18:48:14 UTC (rev 2181)
@@ -74,7 +74,6 @@
               DeleteList.append(MsgObj)
             elif Form["a%d" % Count].value == "whitelist":
               WhiteList.append(MsgObj)
-              ReleaseList.append(MsgObj)
             elif Form["a%d" % Count].value == "blacklist":
               BlackList.append(MsgObj)
               DeleteList.append(MsgObj)
@@ -87,8 +86,6 @@
                 DeleteList.append(MsgObj)
               elif Form["Action"].value == "Whitelist":
                 WhiteList.append(MsgObj)
-		# TODO: Separate release not needed for TMDA 1.1.x
-                ReleaseList.append(MsgObj)
               elif Form["Action"].value == "Blacklist":
                 BlackList.append(MsgObj)
                 DeleteList.append(MsgObj)  
@@ -121,8 +118,6 @@
               DeleteList.append( MsgObj )
             elif Form.has_key("WhitelistButton"):
               WhiteList.append( MsgObj )
-              # TODO: Separate release not needed for TMDA 1.1.x
-              ReleaseList.append( MsgObj )
             elif Form.has_key("ReportButton"):
               SpamList.append( MsgObj )
             elif Form.has_key("ExecuteButton"):
@@ -133,7 +128,6 @@
                 DeleteList.append( MsgObj )
               elif OtherAction == "Whitelist":
                 WhiteList.append( MsgObj )
-                ReleaseList.append( MsgObj )
               elif OtherAction == "Blacklist":
                 BlackList.append( MsgObj )
                 DeleteList.append( MsgObj )
@@ -160,6 +154,8 @@
         DeleteList.append(MsgObj)
       for MsgObj in WhiteList:
         # Whitelist (and release) each message
+        if Defaults.PENDING_WHITELIST_RELEASE:
+          PVars["InProcess"][MsgObj.msgid] = 1
         MsgObj.whitelist()
       for MsgObj in ReleaseList:
         # Release each message


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