CVS: tmda-cgi CgiUtil.py, 1.23, 1.24 ChangeLog, 1.75, 1.76 EditList.py, 1.10, 1.11 PendList.py, 1.34, 1.35

Update of /cvsroot/tmda/tmda-cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14795

Modified Files:
	CgiUtil.py ChangeLog EditList.py PendList.py 
Log Message:
Allow AccessPaths configuration settings to be in local configuration files as
well.

Make sure a list file location passes an AccessPaths test before bringing it
up in an editor.

Catch an unusual error when handling a pending e-mail.


Index: CgiUtil.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/CgiUtil.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CgiUtil.py	23 Aug 2003 18:55:52 -0000	1.23
+++ CgiUtil.py	4 Feb 2004 20:56:23 -0000	1.24
@@ -190,4 +190,8 @@
   for Var in PVars.ThemeVars.options("AccessPaths"):
     if re.search(PVars.ThemeVars.get("AccessPaths", Var, 1) % Dict, Path):
       return 1
+  for Var in PVars.PVars:
+    if Var[:12] == "AccessPaths:":
+      if re.search(PVars.PVars[Var] % Dict, Path):
+        return 1
   return None

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	10 Dec 2003 18:04:31 -0000	1.75
+++ ChangeLog	4 Feb 2004 20:56:23 -0000	1.76
@@ -1,3 +1,13 @@
+2004-02-04  Gre7g Luterman  <[email protected]>
+
+	* Allow AccessPaths configuration settings to be in local configuration
+	  files as well.
+
+	* Make sure a list file location passes an AccessPaths test before
+	  bringing it up in an editor.
+
+	* Catch an unusual error when handling a pending e-mail.
+
 2003-12-10  Jim Ramsay      <[email protected]>
 
 	* ./configure now checks for 'cc' and 'gcc' for those few systems

Index: EditList.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/EditList.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- EditList.py	8 Dec 2003 21:48:05 -0000	1.10
+++ EditList.py	4 Feb 2004 20:56:23 -0000	1.11
@@ -63,13 +63,14 @@
     Parser.read(CgiUtil.ExpandUser(Filters))
     for Test in Parser.filterlist:
       if Test[0] in ["from-file", "to-file", "body-file", "headers-file"]:
-        Filename = os.path.split(Test[2])[1].lower()
-        if SysButtons.has_key(Filename):
-          Buttons[CgiUtil.ExpandUser(Test[2])] = \
-            (Filename, SysButtons[Filename])
-        else:
-          Buttons[CgiUtil.ExpandUser(Test[2])] = \
-            (Filename, SysButtons["other"])
+        if CgiUtil.TestTextFilePath(Test[2]):
+          Filename = os.path.split(Test[2])[1].lower()
+          if SysButtons.has_key(Filename):
+            Buttons[CgiUtil.ExpandUser(Test[2])] = \
+              (Filename, SysButtons[Filename])
+          else:
+            Buttons[CgiUtil.ExpandUser(Test[2])] = \
+              (Filename, SysButtons["other"])
   Files = Buttons.keys()
   Files.sort()
 

Index: PendList.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/PendList.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- PendList.py	27 Jan 2004 16:40:29 -0000	1.34
+++ PendList.py	4 Feb 2004 20:56:23 -0000	1.35
@@ -169,7 +169,7 @@
     Queue.initQueue()
     Queue._loadCache()
     Msgs = Queue.listPendingIds()
-  except Errors.QueueError:
+  except (Errors.QueueError, TypeError):
     Msgs = []
 
   # Search the Pending List:
@@ -216,7 +216,7 @@
     for Msg in Msgs:
       try:
         MsgObj = Pending.Message(Msg)
-      except (IOError, Errors.MessageError), ErrStr:
+      except (IOError, Errors.MessageError, TypeError), ErrStr:
         continue
       # Slow search - Search the fulltext of the message
       if searchScope == 'fullMessage' and \