CVS: tmda-cgi CgiUtil.py,1.20,1.21 ChangeLog,1.33,1.34 THANKS,1.10,1.11 defaults.ini,1.19,1.20

Update of /cvsroot/tmda/tmda-cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv5325

Modified Files:
	CgiUtil.py ChangeLog THANKS defaults.ini 
Log Message:
Added optional message filter to use before reporting messages.


Index: CgiUtil.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/CgiUtil.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CgiUtil.py	22 May 2003 02:48:06 -0000	1.20
+++ CgiUtil.py	22 May 2003 17:14:07 -0000	1.21
@@ -153,7 +153,11 @@
     Sendmail = "-s %s " % PVars[("NoOverride", "Sendmail")]
   else:
     Sendmail = ""
-  Command = "%s reporter.py %s%s" % (sys.executable, Sendmail,
+  if PVars[("NoOverride", "SpamCopFilter")]:
+    Filter = "%s | " % PVars[("NoOverride", "SpamCopFilter")]
+  else:
+    Filter = ""
+  Command = "%s%s reporter.py %s%s" % (Filter, sys.executable, Sendmail,
     PVars[("General", "SpamCopAddr")])
   P = os.popen(Command, "w")
   P.write(MsgObj.msgobj.as_string(1))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	22 May 2003 15:58:23 -0000	1.33
+++ ChangeLog	22 May 2003 17:14:07 -0000	1.34
@@ -1,5 +1,7 @@
 2003-05-22  Gre7g Luterman  <[email protected]>
 
+	* Added optional message filter to use before reporting messages.
+
 	* Added JS confirmation to uninstaller.
 
 	* Widened the list editor text box.

Index: THANKS
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/THANKS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- THANKS	13 May 2003 16:12:36 -0000	1.10
+++ THANKS	22 May 2003 17:14:07 -0000	1.11
@@ -33,6 +33,9 @@
 
     * Jeff Ross -- bug finding
 
+    * David K. Thompson -- suggestion to support spamassassin by adding an
+			   optional message filter
+
     * Ronald Wiplinger -- providing Chinese spam and feedback on whether
                           tmda-cgi was rendering it correctly
 

Index: defaults.ini
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/defaults.ini,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- defaults.ini	13 May 2003 22:25:29 -0000	1.19
+++ defaults.ini	22 May 2003 17:14:07 -0000	1.20
@@ -26,6 +26,7 @@
 MayEditTemplates   = Yes
 MayInstall         = Yes
 Sendmail           =
+SpamCopFilter      =
 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

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs