CVS: tmda-cgi ChangeLog, 1.65, 1.66 PendList.py, 1.25, 1.26 defaults.ini, 1.21, 1.22

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

Modified Files:
	ChangeLog PendList.py defaults.ini 
Log Message:
Added PendingList:ShowDelete and PendingList:ShowBlack (both with default
values of "No") to discourage deleting and blacklisting from the pending list.
These can be re-enabled in the defaults.ini or with the settings page.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	16 Nov 2003 17:35:53 -0000	1.65
+++ ChangeLog	16 Nov 2003 18:42:57 -0000	1.66
@@ -1,5 +1,10 @@
 2003-11-16  Gre7g Luterman  <[email protected]>
 
+	* Added PendingList:ShowDelete and PendingList:ShowBlack (both with
+	  default values of "No") to discourage deleting and blacklisting
+	  from the pending list.  These can be re-enabled in the defaults.ini
+	  or with the settings page.
+
 	* Added a nasty hack to prevent import errors in Python 2.3.
 
 2003-11-15  Gre7g Luterman  <[email protected]>

Index: PendList.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/PendList.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- PendList.py	23 Sep 2003 01:28:25 -0000	1.25
+++ PendList.py	16 Nov 2003 18:42:57 -0000	1.26
@@ -282,9 +282,9 @@
   ScAllowed = 1 and PVars[("General", "SpamCopAddr")]
   FltAllowed = 1
   RlShow    = RlAllowed and 1
-  DlShow    = DlAllowed and 1
+  DlShow    = DlAllowed and (PVars[("PendingList", "ShowDelete")] == "Yes")
   WhShow    = WhAllowed and 1
-  BlShow    = BlAllowed and 1
+  BlShow    = BlAllowed and (PVars[("PendingList", "ShowBlack")] == "Yes")
   ScShow    = ScAllowed and 1
  
   if not RlAllowed:

Index: defaults.ini
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/defaults.ini,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- defaults.ini	23 Aug 2003 18:55:52 -0000	1.21
+++ defaults.ini	16 Nov 2003 18:42:57 -0000	1.22
@@ -74,6 +74,8 @@
 DateFormat  = %Y-%m-%d
 PagerSize   = 15
 ShowAddr    = Name
+ShowDelete  = No
+ShowBlack   = No
 
 [ViewPending]
 AltPref     = text/plain