Current status is now displayed. Apply settings doesn't work!

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

1 files changed, 35 insertions, 24 deletions

diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index 7396d25..abb1f75 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -4,48 +4,59 @@
 
 <H2>Enable/Disable</H2>
 <DT>Change status for this program</DT>
-<DD><input class="radio" type="radio" name="loglevel" value="2" <? if (tostring(view.config.loglevel) == "2") then io.write('checked') end ?>>Enable
-<input class="radio" type="radio" name="loglevel" value="3" <? if (tostring(view.config.loglevel) == "3") then io.write('checked') end ?>>Disable</DD>
+<DD><input class="radio" type="radio" name="enabled" value="2" <? if (view.status.enabled) then io.write('checked') end ?> >Enable
+<input class="radio" type="radio" name="enabled" value="3" <? if not (view.status.enabled) then io.write('checked') end ?> >Disable</DD>
 
 <H2>Guided config</H2>
 <H3>General settings</H3>
 
-<DT>Log to given file</DT>
-<DD><input type="text" class="text" name="smallerlogg" value="<?= view.config.logfile ?>"/>
-<P>(default=/var/log/messages)</P></DD>
-
-<DT>Set local log level</DT>
-<DD><input class="radio" type="radio" name="loglevel" value="1" <? if (tostring(view.config.loglevel) == "1") then io.write('checked') end ?>>1
-<input class="radio" type="radio" name="loglevel" value="2" <? if (tostring(view.config.loglevel) == "2") then io.write('checked') end ?>>2
-<input class="radio" type="radio" name="loglevel" value="3" <? if (tostring(view.config.loglevel) == "3") then io.write('checked') end ?>>3
-<input class="radio" type="radio" name="loglevel" value="4" <? if (tostring(view.config.loglevel) == "4") then io.write('checked') end ?>>4
-<input class="radio" type="radio" name="loglevel" value="5" <? if (tostring(view.config.loglevel) == "5") then io.write('checked') end ?>>5
-<input class="radio" type="radio" name="loglevel" value="" <? if (tostring(view.config.loglevel) == "") then io.write('checked') end ?>>Default
-<p>(1=Quiet, 5=Noisy, Default=Not specifyed any loglevel in the config)</P>
+<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>
 
-<DT>Smaller logging output</DT>
-<DD><input type="checkbox" name="smallog" <? if (view.config.smallog) then io.write('checked') end ?>/></DD>
+<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>
+
+<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>
 
 <H3>Save logs for a longer period</H3>
-<DT>Max size (KB) before rotate</DT>
-<DD><input type="text" class="text" name="maxsize" value="<?= view.config.maxsize ?>"/>
+<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>
 
-<DT>Number of rotated logs to keep</DT>
-<DD><input type="text" class="text" name="logrotate" value="<?= view.config.logrotate ?>"/>
+<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>
 
 <H3>Remote logging</H3>
 
-<DT>Log to IP or hostname on PORT</DT>
-<DD><input type="text" class="text" name="host" value="<?= view.config.remote ?>"/>
-<P>(default PORT=514/UDP)</P></DD>
+<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>
 
 <H2>Save and apply above settings</H2>
 <DT>Apply settings</DT>
 <DD><input class="submitxxx" type="submit" value="Apply"/></DD>
 
-
+<?
+--[[ DEBUG INFORMATION
+require("debugs")
+io.write(debugs.variables(view))
+--]]
+?>