diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/acf-util/logon-controller.lua | 11 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua index 676736f..bdc2327 100644 --- a/app/acf-util/logon-controller.lua +++ b/app/acf-util/logon-controller.lua @@ -25,18 +25,19 @@ logon = function(self) if clientdata.userid and clientdata.password then local t = self.model.logon(self,clientdata.userid,clientdata.password) - + if t == nil then userid.value = self.clientdata.userid userid.errtxt = "There was a problem logging in" else -- the login was successful - give them a new session, and redir to logged in - session.id = session.random_hash ( 512) - session.userinfo = t or {} + self.sessiondata.id = session.random_hash ( 512) + self.sessiondata.userinfo = t or {} + self.conf.prefix="/" self.conf.controller="welcome" - self.conf.action = "" + self.conf.action = "read" self.conf.type = "redir" - logevent ("Logon was successful for " .. session.userinfo.username or "" ) + logevent ("Logon was successful for " .. self.sessiondata.userinfo.username or "" ) error (self.conf) end end diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 1043ade..1f9bf9f 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -164,7 +164,7 @@ view_resolver = function(self) -- the inheritance means self.conf is used instead action = self.conf.action, hostname = h.hostname.value, - alpineversion = alpineversion.worker.read(alpineversion), + -- alpineversion = alpineversion.worker.read(alpineversion), prefix = self.conf.prefix, script = self.conf.appuri, skin = self.conf.skin or "" |