Changing things so we use cfe for sending/receiving things from model and controller.

The view-file is using loops instead to reduce code.

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

1 files changed, 113 insertions, 109 deletions

diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index ddb73c4..8284dc7 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -1,128 +1,132 @@
-<? local view = ... ?>
-
-<h1>SYSTEM INFO</h1>
-
-<DL>
-	<dt><?= view.status.status.name ?></dt>
-		<dd><?= view.status.status.value ?><p class='error'><?= view.status.status.errtxt ?></p></dd>
-
-	<dt><?= view.status.version.name ?></dt>
-		<dd><?= view.status.version.value ?><p class='error'><?= view.status.version.errtxt ?></p></dd>
-</DL>
-
-<H1>CONFIGURATION</H1>
-<form name="config" action="" method="POST">
+<? local form = ... ?>
+<?
+--[[ 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>")
+--]]
+?>
 
-<H2>Advanced config</H2>
-<H3>General settings</H3>
+<H1>SYSTEM INFO</H1>
 <DL>
-	<? var = "-O" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Log to given file</DT>
-		<DD><input type="text" class="text" name="<?= var ?>" value="<?= view.config["SYSLOGD_OPTS"][var] ?>"/>
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("<p class='error'>", view.errors["SYSLOGD_OPTS"]["-O"] ,"</p>") end ?>
-		</DD>
-
-	<? var = "-l" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Set local log level</DT>
-		<DD>
-		<? for i=1, table.maxn(view.config["SYSLOGD_OPTS"]["-l_list"]) do ?>
-			<input class="radio" type="radio" name="<?= var ?>" value="<?= i ?>" 
-				<? if (tostring(view.config["SYSLOGD_OPTS"]["-l_list"][i]) == tostring(view.config["SYSLOGD_OPTS"][var])) 
-					then io.write('checked=yes') end ?>>
-				<?= view.config["SYSLOGD_OPTS"]["-l_list"][i] ?>
-		<? end ?>
-		<p>(1=Quiet, ... , <?= table.maxn(view.config["SYSLOGD_OPTS"]["-l_list"]) ?>=Debug)</p>
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then 
-			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"][var] ,"</p>") 
-		end ?>
-		</DD>
-
-	<? var = "-S" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Smaller logging output</DT>
-		<DD><input type="checkbox" name="<?= var ?>" <? if (view.config["SYSLOGD_OPTS"][var]) then io.write('checked=yes') end ?> />
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then 
-			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"][var] ,"</p>") 
-		end ?>
-		</DD>
+<? 
+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>
 
-<H3>Save logs for a longer period</H3>
-
-<DL>
-	<? var = "-s" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Max size (KB) before rotate</DT>
-		<DD><input type="text" class="text" name="<?= var ?>" value="<?= view.config["SYSLOGD_OPTS"][var] ?>"/>
-		<p>(default=200KB, 0=off)</p>
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then 
-			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"][var] ,"</p>") 
-		end ?>
-		</DD>
-
-	<? var = "-b" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Number of rotated logs to keep</DT>
-		<DD><input type="text" class="text" name="<?= var ?>" value="<?= view.config["SYSLOGD_OPTS"][var] ?>"/>
-		<p>(default=1, max=99, 0=purge)</p>
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then 
-			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"][var] ,"</p>") 
-		end ?>
-		</DD>
-</DL>
+<?
+function configform(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>" .. 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
+			io.write("\t\t</DD>\n")
+		end
+	end
+	io.write("</DL>")
+end
+?>
 
-<H3>Remote logging</H3>
-<DL>
+<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>
+<? 
+local tags = { "remotelogging", }
+configform(myform,tags)
+?>
+<? --]] ?>
 
-	<? var = "-L" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Log locally and via network</DT>
-		<DD><input type="checkbox" name="<?= var ?>" <? if (view.config["SYSLOGD_OPTS"][var]) then io.write('checked=yes') end ?> />
-		<P>(default is network only if you have defined remote-logging)</p>
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then 
-			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"][var] ,"</p>") 
-		end ?>
-		</DD>
-
-	<? var = "-R" ?>
-	<DT <? if (view.errors) and (view.errors["SYSLOGD_OPTS"][var]) then io.write("class='error'") end ?>>Log to IP or hostname on PORT</DT>
-		<DD><input type="text" class="text" name="<?= var ?>" value="<?= view.config["SYSLOGD_OPTS"][var] ?>"/>
-		<P>(Empty=No remote logging) HOST[:PORT] (default PORT=514/UDP)</P>
-		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"][var]) then 
-			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"][var] ,"</p>") 
-		end ?>
-		</DD>
+<H2>ADVANCED CONFIGURATION</H2>
+<H3>GENERAL</H3>
+<? 
+local tags = { "logfile", "loglevel", "smallerlogs", }
+configform(myform,tags)
+?>
 
+<H3>LOGROTATE</H3>
+<? 
+local tags = { "maxsize", "numrotate", }
+configform(myform,tags)
+?>
 
-</DL>
+<H3>REMOTE LOGGING</H3>
+<? 
+local tags = { "localandnetworklog", "remotelogging", }
+configform(myform,tags)
+?>
 
-<H2>Save and apply above settings</H2>
-<DL>
-	<DT>Apply settings</DT>
-		<DD><input class="submit" type="submit" name="cmdsave" value="Apply" /></DD>
-	<? if (view.cmderrors) then ?>
-	<dt class='error'>Errors in previous action</dt>
-		<dd><pre class='error'><?= view.cmderrors?></pre></dd>
-	<? end ?>
-</DL>
+<H2>SAVE AND APPLY ABOVE SETTINGS</H2>
+<? 
+local tags = { "cmd_save", }
+configform(myform,tags)
+?>
 </form>
-<H1>MANAGEMENT</H1>
 
-<dl>
-	<dt>Program controll-panel</dt>
-		<dd><form name="cmd" action="" method="POST">
-		<input type=submit class="submit" name="cmddaemon" value="start">
-		<input type=submit class="submit" name="cmddaemon" value="stop">
-		<input type=submit class="submit" name="cmddaemon" value="restart">
-		</form></dd>
+<? 
+local myform = form.management
+local tags = { "start", "stop", "restart" }
+if (myform) and (myform[tags[1]]) then
+?>
+	<form name="management" action="" method="POST">
+	<H1>MANAGEMENT</H1>
+	<dl>
+		<dt><?= myform[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])) ?>
+			<? end ?>
+		<? end ?>
+		</dd>
 
-	<? if (view.startstop) and (view.startstop.cmdresult) then ?>
-	<dt>Previous action result</dt>
-		<dd><pre><?= view.startstop.cmdresult?></pre></dd>
-	<? end ?>
-</dl>
+<? --[[ ?>
+		<? if (myform.cmd_save_result) then ?>
+		<? local temp ?>
+		<? for k,v in pairs(myform.cmd_save_result) ?>
+			<? temp = temp .. k ?>
+		<? end ?>
+		
+		<dt>Previous action result</dt>
+			<dd><pre><?= temp ?></pre></dd>
+		<? end ?>
+<? --]] ?>
+	</dl>
+	</form>
 
+<? end ?>
 
 <?
 ---[[ DEBUG INFORMATION
-require("debugs")
-io.write(debugs.variables(view))
+io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
+io.write(html.cfe_unpack(form))
+io.write("</span>")
 --]]
 ?>
 
+
+