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/alpine-baselayout/trunk@1120 ab2d0c66-481e-0410-8bed-d214d4d58bed

4 files changed, 12 insertions, 12 deletions

diff --git a/health-controller.lua b/health-controller.lua
index fb7d4fb..72838e1 100644
--- a/health-controller.lua
+++ b/health-controller.lua
@@ -5,21 +5,21 @@ default_action = "system"
 -- Public methods
 
 system = function (self )
-	return ({system = self.model:get_system(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({system = self.model:get_system(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
 
 storage = function (self )
-	return ({storage = self.model:get_storage(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({storage = self.model:get_storage(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
 
 network = function (self )
-	return ({network = self.model:get_network(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({network = self.model:get_network(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
 
 modules = function (self )
-	return ({modules = self.model:get_modules(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({modules = self.model:get_modules(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
 
 proc = function (self )
-	return ({proc = self.model:get_proc(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({proc = self.model:get_proc(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
diff --git a/interfaces-controller.lua b/interfaces-controller.lua
index 4c8c2dd..d2866db 100644
--- a/interfaces-controller.lua
+++ b/interfaces-controller.lua
@@ -12,7 +12,7 @@ read = function (self )
 	-- the "script" "prefix" "controller" "action" as separate fields,
 	-- since the view could be a cli, not a web interface.  the VIEW
 	-- should make a uri from these these elements.
-	local actions = { link = ENV["SCRIPT_NAME"] .. self.conf.prefix ..
+	local actions = { link = self.conf.script .. self.conf.prefix ..
 				self.conf.controller .. "/",
 			  action = { "create", "read", "update", "delete" } }
 	return ( { actions = actions, iface = iface, status=status } )
@@ -81,7 +81,7 @@ update = function(self)
 	data.cmddelete = cfe({type="action", value="Delete", name="cmddelete", label="Delete this record"}) 
 
 	return ( cfe ({type="form", 
-			option={ script=ENV["SCRIPT_NAME"],
+			option={ script=self.conf.script,
 				 prefix=self.conf.prefix,
 				 controller = self.conf.controller,
 				 action = "update",
@@ -120,7 +120,7 @@ delete = function(self)
 	me.action2 = cfe({name="cmd", type="action", value="cancel", label="action"}) 
 
 	return ( cfe ({type="form", 
-			option={ script=ENV["SCRIPT_NAME"],
+			option={ script=self.conf.script,
 				 prefix=self.conf.prefix,
 				 controller = self.conf.controller,
 				 action = "delete",
@@ -158,7 +158,7 @@ create = function(self)
 	data.cmd = cfe({type="action", value="save", label="action"}) 
 
 	return ( cfe ({type="form", 
-			option={ script=ENV["SCRIPT_NAME"],
+			option={ script=self.conf.script,
 				 prefix=self.conf.prefix,
 				 controller = self.conf.controller,
 				 action = "create",
diff --git a/logfiles-controller.lua b/logfiles-controller.lua
index ad8bbe3..3a7900a 100644
--- a/logfiles-controller.lua
+++ b/logfiles-controller.lua
@@ -5,7 +5,7 @@ default_action = "status"
 -- Public methods
 
 status = function (self )
-	return ({logfile = self.model:get(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({logfile = self.model:get(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
 
 delete = function (self)
diff --git a/skins-controller.lua b/skins-controller.lua
index 9becde9..a07d141 100644
--- a/skins-controller.lua
+++ b/skins-controller.lua
@@ -5,13 +5,13 @@ module (..., package.seeall)
 default_action = "read"
 
 read = function (self )
-	return ({skin = self.model:get(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+	return ({skin = self.model:get(), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end
 
 update = function (self )
 	local newskin = self.clientdata.skin or ""
 	local updated = self.model:update(newskin)
 	redirect(self)
---	return ({skin = self.model:get(), updated=self.model:update(newskin), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
+--	return ({skin = self.model:get(), updated=self.model:update(newskin), url = self.conf.script .. self.conf.prefix .. self.conf.controller} )
 end