summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2008-04-08 15:13:25 +0000
committerMika Havela <mika.havela@gmail.com>2008-04-08 15:13:25 +0000
commit9d600c702164cd67bde51031a441ba6b4f2a4184 (patch)
tree720893b7244909af34d5c6282d434c7a41cc33a5
parent448421b511b9630dadb0ebca5de29731d3c56ebf (diff)
downloadacf-quagga-9d600c702164cd67bde51031a441ba6b4f2a4184.tar.bz2
acf-quagga-9d600c702164cd67bde51031a441ba6b4f2a4184.tar.xz
Cleaning up code.
git-svn-id: svn://svn.alpinelinux.org/acf/quagga/trunk@960 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--quagga-expert-html.lsp23
-rw-r--r--quagga-model.lua2
-rw-r--r--quagga-status-html.lsp19
3 files changed, 23 insertions, 21 deletions
diff --git a/quagga-expert-html.lsp b/quagga-expert-html.lsp
index 3f1fedc..4f77e5e 100644
--- a/quagga-expert-html.lsp
+++ b/quagga-expert-html.lsp
@@ -1,7 +1,13 @@
-<? local form = ... ?>
-<?
+<? local form = ...
require("viewfunctions")
?>
+<?
+--[[ 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>
@@ -12,7 +18,6 @@ displayinfo(myform,tags,"viewonly")
?>
</DL>
-
<form name="myform" action="" method="POST">
<h1>CONFIGURATION</h1>
<H2>Expert config</H2>
@@ -39,15 +44,15 @@ displayinfo(myform,tags)
?>
</DL>
-
-<H1>MANAGEMENT</H1>
-<DL>
<?
+-- Management buttons
local myform = form.management
local tags = { "start", "stop", "restart" }
-displaymanagement(myform,tags)
+if (myform) then
+ io.write("<H1>MANAGEMENT</H1>\n<DL>")
+ displaymanagement(myform,tags)
+ io.write("</DL>")
+end
?>
-</DL>
-
</form>
diff --git a/quagga-model.lua b/quagga-model.lua
index fa88a04..d67f80d 100644
--- a/quagga-model.lua
+++ b/quagga-model.lua
@@ -8,8 +8,8 @@ require("format")
require("posix")
require("daemoncontrol")
require("validator")
-require("processinfo")
require("socket")
+require("processinfo")
-- Set variables
local configfile = "/etc/quagga/bgpd.conf"
diff --git a/quagga-status-html.lsp b/quagga-status-html.lsp
index 6b68a52..c70ea95 100644
--- a/quagga-status-html.lsp
+++ b/quagga-status-html.lsp
@@ -1,7 +1,13 @@
-<? local form = ... ?>
-<?
+<? local form = ...
require("viewfunctions")
?>
+<?
+--[[ 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>
@@ -30,12 +36,3 @@ end
?>
</DL>
-
-<?
---[[ 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>")
---]]
-?>
-