diff options
author | Ted Trask <ttrask01@yahoo.com> | 2008-05-15 13:51:21 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2008-05-15 13:51:21 +0000 |
commit | 2019d21baffd94e03608d28eba103150fb1ba1cd (patch) | |
tree | cb024beddde2d98029372215c07e8f0e85be108b | |
parent | 9b8a758b54ffa703067c23b36b9ca801e8cb8d90 (diff) | |
download | acf-shorewall-2019d21baffd94e03608d28eba103150fb1ba1cd.tar.bz2 acf-shorewall-2019d21baffd94e03608d28eba103150fb1ba1cd.tar.xz |
Replaced references to ENV[SCRIPT_NAME] with self.conf.script.
Logon link no longer forced to be https.
git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@1120 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | shorewall-controller.lua | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/shorewall-controller.lua b/shorewall-controller.lua index def860e..bfa680b 100644 --- a/shorewall-controller.lua +++ b/shorewall-controller.lua @@ -463,11 +463,11 @@ function editrecords(self,types,record,errormessage) return { edit=edit, - option={ script=ENV["SCRIPT_NAME"], + option={ script=self.conf.script, prefix=self.conf.prefix, controller = self.conf.controller, action = "config", - link = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, }, + link = self.conf.script .. self.conf.prefix .. self.conf.controller, }, cmdsave=cmdsave, cmddelete=cmddelete, clientdata=clientdata, @@ -637,11 +637,11 @@ function config(self) return { status=status, config=config, - option={ script=ENV["SCRIPT_NAME"], + option={ script=self.conf.script, prefix=self.conf.prefix, controller = self.conf.controller, action = "check", - link = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, }, + link = self.conf.script .. self.conf.prefix .. self.conf.controller, }, clientdata=clientdata, savesuccess=savesuccess, configmessage=configmessage, @@ -676,11 +676,11 @@ function check(self) end return { - option={ script=ENV["SCRIPT_NAME"], + option={ script=self.conf.script, prefix=self.conf.prefix, controller = self.conf.controller, action = "expert", - link = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, }, + link = self.conf.script .. self.conf.prefix .. self.conf.controller, }, management = management, config = config, status = status, @@ -696,11 +696,11 @@ function logfile(self) local config = self.model:getlogfile() return { - option={ script=ENV["SCRIPT_NAME"], + option={ script=self.conf.script, prefix=self.conf.prefix, controller = self.conf.controller, action = "expert", - link = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, }, + link = self.conf.script .. self.conf.prefix .. self.conf.controller, }, config = config, status = status, startstop = startstop, @@ -715,11 +715,11 @@ function expert(self) local config = self.model:getfilelist() return { - option={ script=ENV["SCRIPT_NAME"], + option={ script=self.conf.script, prefix=self.conf.prefix, controller = self.conf.controller, action = "expert", - link = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, }, + link = self.conf.script .. self.conf.prefix .. self.conf.controller, }, config = config, status = status, startstop = startstop, @@ -750,11 +750,11 @@ function edit(self) end return { - option={ script=ENV["SCRIPT_NAME"], + option={ script=self.conf.script, prefix=self.conf.prefix, controller = self.conf.controller, action = "edit", - link = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, }, + link = self.conf.script .. self.conf.prefix .. self.conf.controller, }, modifications = modifications, config = config, status = status, |