4 files changed, 7 insertions, 7 deletions
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 0db0256..f3ab6e1 100755
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -31,7 +31,7 @@ io.write("</span>")
 			<TD>
 			[<A HREF='edituser?userid=<?= name ?>'>Edit this account</A>]
 			[<A HREF='deleteuser?userid=<?= name ?>'>Delete this account</A>]
-			[<A HREF='<?= pageinfo.appuri ?>/acf-util/roles/viewuserroles?userid=<?= name ?>'>View roles for this account</A>]
+			[<A HREF='<?= pageinfo.script ?>/acf-util/roles/viewuserroles?userid=<?= name ?>'>View roles for this account</A>]
 			</TD>
 		</TR>
 	</TABLE></DD>
diff --git a/app/acf_cli-controller.lua b/app/acf_cli-controller.lua
index 7bd283d..dad6b85 100644
--- a/app/acf_cli-controller.lua
+++ b/app/acf_cli-controller.lua
@@ -9,7 +9,7 @@ mvc.on_load = function (self, parent)
 	-- Make sure we have some kind of sane defaults for libdir and sessiondir
 	self.conf.libdir = self.conf.libdir or ( self.conf.appdir .. "/lib/" )
 	self.conf.sessiondir = self.conf.sessiondir or "/tmp/"
-	self.conf.appuri = ""
+	self.conf.script = ""
 	self.conf.default_controller = "welcome"	
 
 	parent_exception_handler = parent.exception_handler
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua
index c9405c2..903851d 100644
--- a/app/acf_www-controller.lua
+++ b/app/acf_www-controller.lua
@@ -191,7 +191,7 @@ local view_resolver = function(self)
 				controller = self.conf.controller,
 				action = self.conf.action,
 				prefix = self.conf.prefix,
-				appuri = self.conf.appuri,
+				script = self.conf.script,
 				appname = self.conf.appname,
 				skin = self.conf.skin or ""
 				}
@@ -209,7 +209,7 @@ mvc.on_load = function (self, parent)
 	-- Make sure we have some kind of sane defaults for libdir and sessiondir
 	self.conf.libdir = self.conf.libdir or ( self.conf.appdir .. "/lib/" )
 	self.conf.sessiondir = self.conf.sessiondir or "/tmp/"
-	self.conf.appuri = "https://" .. ENV.HTTP_HOST .. ENV.SCRIPT_NAME
+	self.conf.script = ENV.SCRIPT_NAME
 	self.conf.default_prefix = "/"
 	self.conf.default_controller = "welcome"
 	self.clientdata = FORM
diff --git a/app/template-html.lsp b/app/template-html.lsp
index 307807f..08ab9b4 100644
--- a/app/template-html.lsp
+++ b/app/template-html.lsp
@@ -13,7 +13,7 @@ Content-Type: text/html
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<? 
+<?
 local hostname = ""
 if viewlibrary and viewlibrary.dispatch_component then
 	local result = viewlibrary.dispatch_component("alpine-baselayout/hostname/read", nil, true)
@@ -44,7 +44,7 @@ end
 		</div>
 		<span class="mute">
 			<p>
-			<? local ctlr = pageinfo.appuri .. "/acf-util/logon/"
+			<? local ctlr = pageinfo.script .. "/acf-util/logon/"
 			
 			if session.userinfo and session.userinfo.userid then
 			   io.write ( string.format("\t\t\t\t\t\t<a href=\"%s\">Log out as '" .. session.userinfo.userid .. "'</a>\n", ctlr .. "logout" ) )
@@ -81,7 +81,7 @@ end
 						class=""
 					end
 					io.write (string.format("\t\t\t\t\t\t<li %s><a href=\"%s%s/%s/%s\">%s</a></li>\n", 
-						class,pageinfo.appuri,group.prefix, group.controller, group.tabs[1].action, group.name ))
+						class,pageinfo.script,group.prefix, group.controller, group.tabs[1].action, group.name ))
 				end
 				io.write ( "\t\t\t\t\t</ul>" )
 			  end