diff options
author | Mika Havela <mika.havela@gmail.com> | 2008-01-10 13:40:16 +0000 |
---|---|---|
committer | Mika Havela <mika.havela@gmail.com> | 2008-01-10 13:40:16 +0000 |
commit | 654032c27bce388045a78fd61af8f3228d1c334f (patch) | |
tree | c1174834b5324295c0cec1d3b0d8ed16e00f5fad | |
parent | 7461680e0b260c680c39afd3e3687fd43a0d2e38 (diff) | |
download | acf-shorewall-654032c27bce388045a78fd61af8f3228d1c334f.tar.bz2 acf-shorewall-654032c27bce388045a78fd61af8f3228d1c334f.tar.xz |
Renamed tab and reorganized first page
git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@531 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | shorewall-controller.lua | 6 | ||||
-rw-r--r-- | shorewall-model.lua | 2 | ||||
-rw-r--r-- | shorewall-status-html.lsp (renamed from shorewall-read-html.lsp) | 17 | ||||
-rw-r--r-- | shorewall.menu | 4 |
4 files changed, 15 insertions, 14 deletions
diff --git a/shorewall-controller.lua b/shorewall-controller.lua index 9e16912..6b47dbb 100644 --- a/shorewall-controller.lua +++ b/shorewall-controller.lua @@ -4,7 +4,7 @@ module(..., package.seeall) -- We use the self.conf table because it already has prefix,controller,etc -- The redir code is defined in the application error handler (acf-controller) local list_redir = function (self) - self.conf.action = "read" + self.conf.action = "status" self.conf.type = "redir" error (self.conf) end @@ -28,7 +28,7 @@ check = function(self) end -read = function(self) +status = function(self) if self.clientdata.cmd == "check" then self.conf.action = "check" self.conf.type = "redir" @@ -37,7 +37,7 @@ read = function(self) if self.clientdata.cmd == "restart" then return ( {programstats = self.model:restart_service(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } ) end - return ( {programstats = self.model:get_status(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } ) + return ( {status = self.model:get_status(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } ) end advanced = function(self) diff --git a/shorewall-model.lua b/shorewall-model.lua index 65e3a57..b3a8abe 100644 --- a/shorewall-model.lua +++ b/shorewall-model.lua @@ -58,7 +58,7 @@ function get_status () local f,error = io.popen("/sbin/shorewall version") local programversion = "shorewall-" .. f:read("*l") f:close() - return {programversion=programversion,programstatus=programstatus,programstate=programstate} + return {version=programversion,status=programstatus,state=programstate} end diff --git a/shorewall-read-html.lsp b/shorewall-status-html.lsp index 831a350..4af95f6 100644 --- a/shorewall-read-html.lsp +++ b/shorewall-status-html.lsp @@ -1,25 +1,26 @@ <? local view = ... ?> -<h1>Firewall configuration</h1> +<h1>SYSTEM INFO</h1> <h2>SYSTEM INFO</h2> -<dt>Program version</dt> -<dd><?= view.programstats.programversion ?></dd> - <dt>Program status</dt> -<dd><?= view.programstats.programstatus ?></dd> +<DD><?= view.status.status ?></DD> -<dt>Program state</dt> -<dd><?= view.programstats.programstate ?></dd> +<dt>Program version</dt> +<dd><?= view.status.version ?></dd> -<h2>MANAGEMENT</h2> +<H3>PROGRAM SPECIFIC OPTIONS/INFORMATION</H3> +<dt>Program reports</dt> +<dd><?= view.status.state ?></dd> +<? --[[ ?> <dt>Preform check of configs</dt> <dd><form name="check" action="" method="POST"><input type="submit" name="cmd" value="check" class="submit"></form></dd> <dt>Preform fw restart</dt> <dd><form name="restart" action="" method="POST"><input type="submit" name="cmd" value="restart" class="submit"></form><? if (view.programstats.restart) then io.write(view.programstats.restart) end ?></dd> +<? --]] ?> <? --[[ DEBUG INFORMATION diff --git a/shorewall.menu b/shorewall.menu index 14ae912..8fb8c10 100644 --- a/shorewall.menu +++ b/shorewall.menu @@ -1,3 +1,3 @@ -#CAT GROUP/DESC TAB ACTION -Networking 40Firewall Firewall read +#CAT GROUP/DESC TAB ACTION +Networking 40Firewall Firewall status |