CVS: tmda-cgi Templates.py,1.4,1.5
Jim Ramsay <[email protected]> Wed, 18 Feb 2004 09:16:12 -0800
| Newsgroups | gmane.mail.spam.tmda.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tmda/tmda-cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25723
Modified Files:
Templates.py
Log Message:
Now can edit more than just the three hard-coded templates.
Index: Templates.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/Templates.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Templates.py 23 Aug 2003 18:55:52 -0000 1.4
+++ Templates.py 18 Feb 2004 17:16:08 -0000 1.5
@@ -44,50 +44,53 @@
else:
T["NoSave"]
- for BaseName in ("bounce", "confirm_accept", "confirm_request"):
- if Defaults.TEMPLATE_DIR:
- Filename = os.path.join(Defaults.TEMPLATE_DIR, BaseName + ".txt")
- else:
- Filename = os.path.join(os.environ["TMDA_BASE_DIR"], "templates",
- BaseName + ".txt")
- T["Var"] = BaseName
-
- # Get file
- T["FilePath"] = Filename
- if CgiUtil.TestTextFilePath(Filename):
- try:
- F = open(Filename)
- FileContents = F.read()
- F.close()
- except IOError:
- FileContents = ""
- else:
- FileContents = "(File is not accessible.)"
-
- # Saving?
- if Form.has_key("subcmd") and \
- (PVars[("NoOverride", "MayEditTemplates")][0].lower() == "y"):
- try:
- # Make sure the list is properly formatted
+ if Defaults.TEMPLATE_DIR:
+ baseDir = Defaults.TEMPLATE_DIR
+ else:
+ baseDir = os.environ["TMDA_BASE_DIR"]
+
+ for BaseName in os.listdir( baseDir ):
+ if BaseName.endswith( ".txt" ):
+ Filename = os.path.join( baseDir, BaseName )
+
+ T["Var"] = BaseName
+
+ # Get file
+ T["FilePath"] = Filename
+ if CgiUtil.TestTextFilePath(Filename):
try:
- FileContents = re.sub("\r\n", "\n", Form[BaseName].value)
- except KeyError:
+ F = open(Filename)
+ FileContents = F.read()
+ F.close()
+ except IOError:
FileContents = ""
- FileContents = re.sub("\n*$", "", FileContents)
- FileContents += "\n"
+ else:
+ FileContents = "(File is not accessible.)"
- if CgiUtil.TestTextFilePath(Filename):
- F = open(Filename, "w")
- F.write(FileContents)
- F.close()
- except IOError, ErrStr:
- CgiUtil.TermError("Unable to save template file.",
- "Insufficient privileges", "save template", "%s<br>%s" % (ErrStr,
- CgiUtil.FileDetails("Template", Filename)),
- "Change file permissions on <tt>%s</tt>" % Filename)
+ # Saving?
+ if Form.has_key("subcmd") and \
+ (PVars[("NoOverride", "MayEditTemplates")][0].lower() == "y"):
+ try:
+ # Make sure the list is properly formatted
+ try:
+ FileContents = re.sub("\r\n", "\n", Form[BaseName].value)
+ except KeyError:
+ FileContents = ""
+ FileContents = re.sub("\n*$", "", FileContents)
+ FileContents += "\n"
+
+ if CgiUtil.TestTextFilePath(Filename):
+ F = open(Filename, "w")
+ F.write(FileContents)
+ F.close()
+ except IOError, ErrStr:
+ CgiUtil.TermError("Unable to save template file.",
+ "Insufficient privileges", "save template", "%s<br>%s" % (ErrStr,
+ CgiUtil.FileDetails("Template", Filename)),
+ "Change file permissions on <tt>%s</tt>" % Filename)
- T["FileContents"] = FileContents
- Row.Add()
+ T["FileContents"] = FileContents
+ Row.Add()
# Display template
print T