Update of /cvsroot/tmda/tmda/contrib/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv25194
Modified Files:
View.py
Log Message:
Bugfix:
Trap errors if a message payload is None.
Mark released or whitelisted messages as "InProcess".
Index: View.py
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/cgi/View.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- View.py 28 Nov 2002 17:14:22 -0000 1.3
+++ View.py 29 Nov 2002 17:17:32 -0000 1.4
@@ -113,9 +113,11 @@
MsgObj.delete()
elif Form["subcmd"].value == "release":
MsgObj.release()
+ PVars["InProcess"][PVars["MsgID"]] = 1
elif Form["subcmd"].value == "white":
MsgObj.whitelist()
MsgObj.release()
+ PVars["InProcess"][PVars["MsgID"]] = 1
elif Form["subcmd"].value == "black":
MsgObj.blacklist()
MsgObj.delete()
@@ -126,6 +128,7 @@
if len(Msgs) == 0: # Oops! None left!
print "Location: %s?cmd=list&SID=%s\n" % \
(os.environ["SCRIPT_NAME"], PVars.SID)
+ PVars.Save()
return
if MsgIdx >= len(Msgs): PVars["MsgID"] = Msgs[-1]
else: PVars["MsgID"] = Msgs[MsgIdx]
@@ -181,8 +184,11 @@
TextParts += 1
if TextParts > 1: MsgHTML += "<hr class=PartDiv>"
if Type == "text/plain":
- MsgHTML += "<span class=EmailText>%s</span>" % \
- string.replace(CgiUtil.Escape(string.strip(Part.get_payload(decode=1))),
"\n", " <br>")
+ try:
+ MsgHTML += "<span class=EmailText>%s</span>" % \
+ string.replace(CgiUtil.Escape(string.strip(Part.get_payload(decode=1))),
+"\n", " <br>")
+ except:
+ pass
else:
MsgHTML += Part.get_payload(decode=1)
# Don't show anything if the part contains other parts
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
