From 1c7304ac542c7e4983c4b6a3a515b8df3fe67515 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 15 Aug 2012 11:40:37 +0000
Subject: Removed check function as it is now handled in startstop

---
 shorewall-controller.lua     | 4 ----
 shorewall-listfiles-html.lsp | 6 +-----
 shorewall-model.lua          | 9 ---------
 shorewall.roles              | 3 +--
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/shorewall-controller.lua b/shorewall-controller.lua
index 6b27c27..934e92c 100644
--- a/shorewall-controller.lua
+++ b/shorewall-controller.lua
@@ -22,10 +22,6 @@ function edit(self)
 	return self.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit File", "File Saved")
 end
 
-function check(self)
-	return self:redirect_to_referrer(self.model.configcheck())
-end
-
 function logfile(self)
 	return self.model.getlogfile()
 end
diff --git a/shorewall-listfiles-html.lsp b/shorewall-listfiles-html.lsp
index 20892fa..d079e3b 100644
--- a/shorewall-listfiles-html.lsp
+++ b/shorewall-listfiles-html.lsp
@@ -2,7 +2,7 @@
 require("htmlviewfunctions")
 %>
 
-<% htmlviewfunctions.displaycommandresults({"edit", "check"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"edit"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
@@ -26,8 +26,4 @@ end %>
 	</TR>
 <% end %>
 </TABLE>
-<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/check") %>">
-<DT>Check Configuration</DT>
-<DD><input class="submit" type="submit" value="Check"></DD>
-</form>
 </DL>
diff --git a/shorewall-model.lua b/shorewall-model.lua
index 7326094..d438b66 100644
--- a/shorewall-model.lua
+++ b/shorewall-model.lua
@@ -189,15 +189,6 @@ function startstop_service(self, startstop, action)
         return modelfunctions.startstop_service(startstop, action)
 end
 
-function configcheck ()
-	local checkresult = {">> Check starts at: " .. os.date() .. "\n"}
-	local f = io.popen("/etc/init.d/shorewall check 2>&1")
-	checkresult[2] = f:read("*a") or ""
-	f:close()
-	checkresult[3] = ">> Check stops at: "..os.date()
-	return cfe({ type="longtext", value=table.concat(checkresult, "\n"), label="Result of checking config" })
-end
-
 function getlogfile ()
 	local logfilepath = format.parse_ini_file(fs.read_file(configfile) or "","","LOGFILE") or ""
 	return cfe({ value=logfilepath, label="Shorewall logfile" })
diff --git a/shorewall.roles b/shorewall.roles
index 5594365..49eb0e8 100644
--- a/shorewall.roles
+++ b/shorewall.roles
@@ -1,4 +1,3 @@
 USER=shorewall:status,shorewall:details,shorewall:logfile,shorewall:startstop
-EDITOR=shorewall:check
 EXPERT=shorewall:listfiles,shorewall:edit
-ADMIN=shorewall:status,shorewall:details,shorewall:logfile,shorewall:startstop,shorewall:check,shorewall:listfiles,shorewall:edit
+ADMIN=shorewall:status,shorewall:details,shorewall:logfile,shorewall:startstop,shorewall:listfiles,shorewall:edit
-- 
cgit v1.2.3