Cleaning up code.

git-svn-id: svn://svn.alpinelinux.org/acf/fetchmail/trunk@955 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 11 insertions, 58 deletions

diff --git a/fetchmail-config-html.lsp b/fetchmail-config-html.lsp
index fdc5422..8dc090d 100644
--- a/fetchmail-config-html.lsp
+++ b/fetchmail-config-html.lsp
@@ -1,4 +1,6 @@
-<? local form = ... ?>
+<? local form = ... 
+require("viewfunctions")
+?>
 <?
 --[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
@@ -7,52 +9,14 @@ io.write("</span>")
 --]]
 ?>
 
-
-<?
-function informationform(myform,tags)
-	io.write("<DL>")
-	for k,v in pairs(tags) do 
-		if (myform[v]) and (myform[v].value) then
-			local val = myform[v] 
-			io.write("\t<DT")
-			if (#val.errtxt > 0) then io.write(" class='error'") end
-			io.write(">" .. val.label .. "</DT>\n")
-
-			io.write("\t\t<DD>" .. val.value .. "\n")
-			if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>\n") end
-			if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>\n") end
-			io.write("\t\t</DD>\n")
-		end
-	end
-	io.write("</DL>")
-end
-?>
-<?
-function configform(myform,tags)
-	io.write("<DL>")
-	for k,v in pairs(tags) do 
-		if (myform[v]) and (myform[v].value) then
-			local val = myform[v] 
-			io.write("\t<DT")
-			if (#val.errtxt > 0) then io.write(" class='error'") end
-			io.write(">" .. val.label .. "</DT>\n")
-
-			io.write("\t\t<DD>" .. html.form[val.type](val) .. "\n")
-			if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>\n") end
-			if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>\n") end
-			io.write("\t\t</DD>\n")
-		end
-	end
-	io.write("</DL>")
-end
-?>
-
 <H1>SYSTEM INFO</H1>
+<DL>
 <? 
 local myform = form.status 
 local tags = { "status", "version", "autostart", }
-informationform(myform,tags)
+displayinfo(myform,tags,"viewonly")
 ?>
+</DL>
 
 <H1>CONFIGURATION</H1>
 <? local myform = form.config ?>
@@ -65,7 +29,7 @@ informationform(myform,tags)
 <P>Select how often the mailboxes will be checked. For ETRN transfers (below) this specifies how often transfers are initiated</P>
 <? 
 local tags = { "freq", }
-configform(myform,tags)
+displayinfo(myform,tags)
 ?>
 <? --]] ?>
 
@@ -141,14 +105,14 @@ io.write("</TABLE></CENTER>")
 <P>The Postmaster address is the address of last resort when fetchmail cannot determine how to send a mail message. If left blank, undelieverable mail may be discarded.</P>
 <? 
 local tags = { "postmaster", }
-configform(myform,tags)
+displayinfo(myform,tags)
 ?>
 
 <H3>ETRN</H3>
 <P>This is for branches that have DNS mail domains hosted by an ISP that allows for ETRN dequeueing. ETRN dequeueing causes the SMTP mail exchanger at the ISP to forward mail to you via SMTP. You will need to make sure that DNS is setup appropriately and that your ISP supports ETRN. If you have not arranged with your ISP to have ETRN support, leave these fields blank.</P>
 <? 
 local tags = { "etrnremote","etrnquedomain", }
-configform(myform,tags)
+displayinfo(myform,tags)
 ?>
 
 
@@ -157,7 +121,7 @@ configform(myform,tags)
 <H3>GENERAL</H3>
 <? 
 local tags = { "logfile", "loglevel", "smallerlogs", }
-configform(myform,tags)
+displayinfo(myform,tags)
 ?>
 
 <? --]] ?>
@@ -165,7 +129,7 @@ configform(myform,tags)
 <H2>SAVE AND APPLY ABOVE SETTINGS</H2>
 <? 
 local tags = { "cmdsave","cmdtest", }
-configform(myform,tags)
+displayinfo(myform,tags)
 ?>
 </form>
 
@@ -194,14 +158,3 @@ if (cmdform) and (cmdform[tags[1]]) then
 	</form>
 
 <? end ?>
-
-<?
---[[ DEBUG INFORMATION
-io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
-io.write(html.cfe_unpack(form))
-io.write("</span>")
---]]
-?>
-
-
-