Many changes (mostly to use cfe's when sending/receiving things from model/controller/view).

git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@676 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 37 insertions, 29 deletions

diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index dc8fe5a..cce5f25 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -7,26 +7,25 @@ io.write("</span>")
 --]]
 ?>
 
-<H1>SYSTEM INFO</H1>
-<DL>
-<? 
-local myform = form.status 
-local tags = { "status", "version", }
-
-for k,v in pairs(tags) do 
-	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'>" .. val.descr .. "</P>\n") end
-	if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. val.errtxt .. "</P>\n") end
-	io.write("\t\t</DD>\n")
-
-end ?>
-</DL>
+<?
+function informationform(myform,tags)
+	io.write("<DL>")
+	for k,v in pairs(tags) do 
+		if (myform[v]) 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>")
@@ -38,8 +37,8 @@ function configform(myform,tags)
 			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<PRE CLASS='descr'>" .. val.descr .. "</PRE>\n") end
-			if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. val.errtxt .. "</P>\n") end
+			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
@@ -47,12 +46,19 @@ function configform(myform,tags)
 end
 ?>
 
+<H1>SYSTEM INFO</H1>
+<? 
+local myform = form.status 
+local tags = { "status", "version", }
+informationform(myform,tags)
+?>
+
 <H1>CONFIGURATION</H1>
 <? local myform = form.config ?>
 <form action="<?= form.option.script .. "/" .. form.option.prefix ..
 		form.option.controller .. "/" .. form.option.action ?>" method="POST">
 
-<? --[[ ?>
+<? ---[[ ?>
 <H2>GUIDED CONFIGURATION</H2>
 <H3>REMOTE LOGGING</H3>
 <? 
@@ -61,6 +67,7 @@ configform(myform,tags)
 ?>
 <? --]] ?>
 
+<? --[[ ?>
 <H2>ADVANCED CONFIGURATION</H2>
 <H3>GENERAL</H3>
 <? 
@@ -79,27 +86,28 @@ configform(myform,tags)
 local tags = { "localandnetworklog", "remotelogging", }
 configform(myform,tags)
 ?>
+<? --]] ?>
 
 <H2>SAVE AND APPLY ABOVE SETTINGS</H2>
 <? 
-local tags = { "cmd_save", }
+local tags = { "cmdsave", }
 configform(myform,tags)
 ?>
 </form>
 
 <? 
-local myform = form.management
+local cmdform = form.management
 local tags = { "start", "stop", "restart" }
-if (myform) and (myform[tags[1]]) then
+if (cmdform) and (cmdform[tags[1]]) then
 ?>
 	<form name="management" action="" method="POST">
 	<H1>MANAGEMENT</H1>
 	<dl>
-		<dt><?= myform[tags[1]]["label"] ?></dt>
+		<dt><?= cmdform[tags[1]]["label"] ?></dt>
 		<dd>
 		<? for k,v in pairs(tags) do ?>
-			<? if (myform[v]) then ?>
-				<? io.write(html.form[myform[v].type](myform[v])) ?>
+			<? if (cmdform[v]) then ?>
+				<? io.write(html.form[cmdform[v].type](cmdform[v])) ?>
 			<? end ?>
 		<? end ?>
 		</dd>
@@ -114,7 +122,7 @@ if (myform) and (myform[tags[1]]) then
 <? end ?>
 
 <?
----[[ DEBUG INFORMATION
+--[[ 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>")