From c1c2252c53ffcb14b98443f8ee2c6da40551f160 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 15 May 2008 13:51:21 +0000 Subject: 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/core/trunk@1120 ab2d0c66-481e-0410-8bed-d214d4d58bed --- app/acf-util/password-status-html.lsp | 2 +- app/acf_cli-controller.lua | 2 +- app/acf_www-controller.lua | 4 ++-- app/template-html.lsp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'app') 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("") [Edit this account] [Delete this account] - [View roles for this account] + [View roles for this account] 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 -

- Log out as '" .. session.userinfo.userid .. "'\n", ctlr .. "logout" ) ) @@ -81,7 +81,7 @@ end class="" end io.write (string.format("\t\t\t\t\t\t

  • %s
    • \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" ) end -- cgit v1.2.3