summaryrefslogtreecommitdiffstats
path: root/dansguardian-plain-html.lsp
diff options
context:
space:
mode:
Diffstat (limited to 'dansguardian-plain-html.lsp')
-rw-r--r--dansguardian-plain-html.lsp78
1 files changed, 55 insertions, 23 deletions
diff --git a/dansguardian-plain-html.lsp b/dansguardian-plain-html.lsp
index cf76317..7ef2847 100644
--- a/dansguardian-plain-html.lsp
+++ b/dansguardian-plain-html.lsp
@@ -1,4 +1,5 @@
<?
+require("viewfunctions")
local form = ...
local data = form.option
local service = form.service
@@ -6,7 +7,7 @@
local srv1fill = ""
local srv2fill = "disabled"
- if service.status == "running" then
+ if form.info.status.value == "Enabled" then
srv1fill = "disabled"
srv2fill = ""
end
@@ -18,34 +19,65 @@
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>")
+--]]
+?>
+
+<H1>SYSTEM INFO</H1>
+<DL>
+<?
+local myform = form.info
+local tags = { "status", "version", "autostart", }
+displayinfo(myform,tags,"viewonly")
+?>
+</DL>
+
<h1>Content Filter (Plain Config File)</h1>
-<p class=warning>WARNING:</p>
-<p>Modifying the DansGuardian configuration file is generally not necessary.
-You must be familiar with the configuration file before proceeding.</p>
+<DL>
+<DT>Warning</DT>
+<DD class=warning>Modifying the DansGuardian configuration file is generally not necessary.
+You must be familiar with the configuration file before proceeding.</DD>
+<DT>Information</DT>
+<DD>These parameters define the interface and port that Dansguardian uses to accept connections.</DD>
+</DL>
-<h2>Status</h2>
<form action="" method="POST">
-<dl><dt>dansguardian is: <? io.write( service.status ) ?> </dt>
-<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>>
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>>
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>></dd></dl>
-</form>
-<p class="error"><? io.write( service.message ) ?></p>
+<h2>Configuration</h2>
+<textarea name="config"><? io.write( service.config ) ?></textarea>
-<p>
-This process runs as a service. When you make and save changes, the configuration
-files for the service are changed. However, the changes will not be <i>applied</i>
-until you restart the service.
-</p>
-<form action="" method="POST">
-<h2>Configuration</h2>
-<p><pre class=error><? io.write( service.cfgerr ) ?></pre></p>
-<p>These parameters define the interface and port that Dansguardian uses to accept connections.</p>
+<h2>Save changes</h2>
+<dl>
+<?
+local myform = form.service
+local tags = { "cmdsave", }
+displayinfo(myform,tags)
+?>
+<? if (service) and (service.error) and (#service.error > 0) then ?>
+<DT>Config status</DT><DD class="error"><? io.write(service.error ) ?></DD>
+<? end ?>
+<? if (service) and (service.cfgerr) and (#service.cfgerr > 0) then ?>
+<DT>Config status</DT><DD class="error"><? io.write(service.cfgerr ) ?></DD>
+<? end ?>
-<textarea name="config"><? io.write( service.config ) ?></textarea>
+<DT>Process information</DT><DD>This process runs as a service. When you make and save changes, the configuration
+files for the service are changed. However, the changes will not be <i>applied</i>
+until you restart the service.</DD>
-<h3>Save Changes</h3>
-<dl><dt>Save the contents of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd></dl>
+</dl>
</form>
+<h1>MANAGEMENT</h1>
+<form action="" method="POST">
+<dl>
+<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>>
+<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>>
+<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>>
+<? if (service.message) and (service.message.descr) and (#service.message.descr > 0) then ?><pre><? io.write( service.message.descr ) ?></pre><? end ?></dd>
+</dl>
+</form>