Removed typo and cleaned up the code.

git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@977 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 3 insertions, 9 deletions

diff --git a/shorewall-controller.lua b/shorewall-controller.lua
index 3d0f7be..a2038fe 100644
--- a/shorewall-controller.lua
+++ b/shorewall-controller.lua
@@ -23,7 +23,6 @@ local function displaycmdmanagement(pidofstatus)
 		label="Program control-panel",
 		value="Start",
 		type="submit",
-		descr="When starting or restarting BGP, the web-page will freeze for some reason!",
 		})
 	management.stop = cfe({ name="cmdmanagement",
 		label="Program control-panel",
@@ -550,7 +549,6 @@ function config(self)
 		label="Edit above record",
 		value="Edit",
 		type="submit",
---		disabled="yes",
 		})
 	config.params_cmd.descr="Mark a item in above list before pressing [" .. config.params_cmd.value .. "]"
 
@@ -560,7 +558,6 @@ function config(self)
 		label="Edit above record",
 		value="Edit",
 		type="submit",
---		disabled="yes",
 		})
 	config.interfaces_cmd.descr="Mark a item in above list before pressing [" .. config.interfaces_cmd.value .. "]"
 
@@ -570,7 +567,6 @@ function config(self)
 		label="Edit above record",
 		value="Edit",
 		type="submit",
---		disabled="yes",
 		})
 	config.zones_cmd.descr="Mark a item in above list before pressing [" .. config.zones_cmd.value .. "]"
 
@@ -580,7 +576,6 @@ function config(self)
 		label="Edit above record",
 		value="Edit",
 		type="submit",
---		disabled="yes",
 		})
 	config.policy_cmd.descr="Mark a item in above list before pressing [" .. config.policy_cmd.value .. "]"
 
@@ -590,8 +585,6 @@ function config(self)
 		label="Edit above record",
 		value="Edit",
 		type="submit",
---		disabled="yes",
---		errtxt="This button is not yet programmed!",
 		})
 	config.rules_cmd.descr="Mark a item in above list before pressing [" .. config.rules_cmd.value .. "]"
 
@@ -599,7 +592,8 @@ function config(self)
 	config.check_cmd = cfe ({
 		name="check_cmd",
 		label="Check if config works",
-		descr="Attention! This check could take a long time depending on your configuration.",
+		descr="After your check, you will be able to start/stop/restart the process.",
+		errtxt="Attention! This check could take a long time depending on your configuration.",
 		value="Check",
 		type="submit",
 		})
diff --git a/shorewall-model.lua b/shorewall-model.lua
index 7dee572..4acb9da 100644
--- a/shorewall-model.lua
+++ b/shorewall-model.lua
@@ -48,7 +48,7 @@ local function read_config(file)
 	local filecontent = fs.read_file_as_array(path)
 	local output = {}
 	for k,v in pairs(filecontent) do
-		if not string.find ( v, "^[;#].*" ) then
+		if not string.find ( v, "^[;#].*" ) and not (string.find (v, "^%s*$")) then
 			table.insert(output, v)
 		end
 	end