Expert-tab works.

Statuspage works.
Configpage shows current settings, but saving changes doesnt work (work in progress).

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

1 files changed, 64 insertions, 46 deletions

diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index f7aab7b..1167751 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -2,6 +2,7 @@
 
 <h1>SYSTEM INFO</h1>
 
+
 <DL>
 <dt>Program status</dt>
 <DD><? if (view.status.enabled) then io.write('Enabled') else io.write('Disabled') end ?></DD>
@@ -15,63 +16,78 @@
 <H1>CONFIGURATION</H1>
 <H2>Advanced config</H2>
 <H3>General settings</H3>
-
-<DL>
-<DT><?= view.config.logfile.label ?></DT>
-<DD><input type="text" class="text" name="smallerlogg" value="<?= view.config.logfile.value ?>"/>
-<P>(default=/var/log/messages)</P>
-<p class="error"><?= view.config.logfile.errtxt ?></p>
-</DD>
-</DL>
-
-<DL>
-<DT><?= view.config.loglevel.label ?></DT>
-<DD><input class="radio" type="radio" name="loglevel" value="1" <? if (tostring(view.config.loglevel.value) == "1") then io.write('checked') end ?>>1
-<input class="radio" type="radio" name="loglevel" value="2" <? if (tostring(view.config.loglevel.value) == "2") then io.write('checked') end ?>>2
-<input class="radio" type="radio" name="loglevel" value="3" <? if (tostring(view.config.loglevel.value) == "3") then io.write('checked') end ?>>3
-<input class="radio" type="radio" name="loglevel" value="4" <? if (tostring(view.config.loglevel.value) == "4") then io.write('checked') end ?>>4
-<input class="radio" type="radio" name="loglevel" value="5" <? if (tostring(view.config.loglevel.value) == "5") then io.write('checked') end ?>>5
-<input class="radio" type="radio" name="loglevel" value="" <? if (tostring(view.config.loglevel.value) == "") then io.write('checked') end ?>>Default
-<p><?= view.config.loglevel.helptxt ?></P>
-<p class="error"><?= view.config.loglevel.errtxt ?></p></DD>
-</DL>
-
 <DL>
-<DT><?= view.config.smallog.label ?></DT>
-<DD><input type="checkbox" name="smallog" <? if (view.config.smallog.value ~= "") then io.write('checked') end ?>/><p class="error"><?= view.config.smallog.errtxt ?></p></DD>
+	<DT<? if (view.errors) and (view.errors.LBU_MEDIA) then io.write("class='error'") end ?>>Log to given file</DT>
+		<DD><input type="text" class="text" name="smallerlogg" value="<?= view.config["SYSLOGD_OPTS"]["-O"] ?>"/>
+		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"]["-O"]) then io.write("<p class='error'>", view.errors["SYSLOGD_OPTS"]["-O"] ,"</p>") end ?>
+		</DD>
+
+	<DT>Set local log level</DT>
+		<DD>
+		<? for i=1, table.maxn(view.config["SYSLOGD_OPTS"]["-l_list"]) do ?>
+			<input class="radio" type="radio" name="loglevel" value="1" 
+				<? if (tostring(view.config["SYSLOGD_OPTS"]["-l_list"][i]) == tostring(view.config["SYSLOGD_OPTS"]["-l"])) 
+					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"]["-l"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-l"] ,"</p>") 
+		end ?>
+		</DD>
+
+	<DT>Smaller logging output</DT>
+		<DD><input type="checkbox" name="smallog" <? if (view.config["SYSLOGD_OPTS"]["-S"]) then io.write('checked=yes') end ?> />
+		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"]["-S"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-S"] ,"</p>") 
+		end ?>
+		</DD>
 </DL>
 
 <H3>Save logs for a longer period</H3>
-<DL>
-<DT><?= view.config.maxsize.label ?></DT>
-<DD><input type="text" class="text" name="maxsize" value="<?= view.config.maxsize.value ?>"/>
-<p>(default=200KB, 0=off)</p>
-<p class="error"><?= view.config.maxsize.errtxt ?></p>
-</DD>
-</DL>
 
 <DL>
-<DT><?= view.config.logrotate.label ?></DT>
-<DD><input type="text" class="text" name="logrotate" value="<?= view.config.logrotate.value ?>"/>
-<p>(default=1, max=99, 0=purge)</p>
-<p class="error"><?= view.config.logrotate.errtxt ?></p>
-</DD>
+	<DT>Max size (KB) before rotate</DT>
+		<DD><input type="text" class="text" name="maxsize" value="<?= view.config["SYSLOGD_OPTS"]["-s"] ?>"/>
+		<p>(default=200KB, 0=off)</p>
+		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"]["-s"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-s"] ,"</p>") 
+		end ?>
+		</DD>
+
+	<DT>Number of rotated logs to keep</DT>
+		<DD><input type="text" class="text" name="logrotate" value="<?= view.config["SYSLOGD_OPTS"]["-b"] ?>"/>
+		<p>(default=1, max=99, 0=purge)</p>
+		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"]["-b"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-b"] ,"</p>") 
+		end ?>
+		</DD>
 </DL>
 
 <H3>Remote logging</H3>
-
 <DL>
-<DT><?= view.config.remote.label ?></DT>
-<DD><input type="text" class="text" name="host" value="<?= view.config.remote.value ?>"/>
-<P>(default PORT=514/UDP)</P>
-<p class="error"><?= view.config.remote.errtxt ?></p>
-</DD>
-</DL>
+	<DT>Activate remote logging</DT>
+		<DD><input type="checkbox" name="remotelogging" <? if (view.config["SYSLOGD_OPTS"]["-R"]) then io.write('checked=yes') end ?> />
+		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"]["-R"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-R"] ,"</p>") 
+		end ?>
+		</DD>
+	<DT>Log locally and via network</DT>
+		<DD><input type="checkbox" name="smallog" <? if (view.config["SYSLOGD_OPTS"]["-L"]) 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"]["-L"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-L"] ,"</p>") 
+		end ?>
+		</DD>
+	<DT>Log to IP or hostname on PORT</DT>
+		<DD><input type="text" class="text" name="host" value="<?= view.config["SYSLOGD_OPTS"]["-R"] ?>"/>
+		<P>HOST[:PORT] (default PORT=514/UDP)</P>
+		<? if (view.errors["SYSLOGD_OPTS"]) and (view.errors["SYSLOGD_OPTS"]["-R"]) then 
+			io.write("<p class='error'>",view.errors["SYSLOGD_OPTS"]["-R"] ,"</p>") 
+		end ?>
+		</DD>
+
 
-<H2>Save and apply above settings</H2>
-<DL>
-<DT>Apply settings</DT>
-<DD><input class="submit" type="submit" value="Apply" disabled/></DD>
 </DL>
 
 <H1>MANAGEMENT</H1>
@@ -92,9 +108,11 @@
 </dl>
 <? end ?>
 
+
 <?
 --[[ DEBUG INFORMATION
 require("debugs")
 io.write(debugs.variables(view))
 --]]
 ?>
+