summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Angelacos <nangel@tetrasec.net>2007-12-22 22:41:43 +0000
committerNathan Angelacos <nangel@tetrasec.net>2007-12-22 22:41:43 +0000
commit60ef1fb4acc1788ce083f93c7d5e93ec67b2c157 (patch)
tree9b63fe55c4caa321d665578fe660c1f5a461b83f
parent478ba3ce3d2f0f51e9867b82409d064b137c4479 (diff)
downloadacf-core-60ef1fb4acc1788ce083f93c7d5e93ec67b2c157.tar.bz2
acf-core-60ef1fb4acc1788ce083f93c7d5e93ec67b2c157.tar.xz
on logon, the session table actually gets saved
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@451 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--app/acf-util/logon-controller.lua5
-rw-r--r--app/acf_www-controller.lua10
2 files changed, 10 insertions, 5 deletions
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua
index bdc2327..3661320 100644
--- a/app/acf-util/logon-controller.lua
+++ b/app/acf-util/logon-controller.lua
@@ -31,13 +31,12 @@ logon = function(self)
userid.errtxt = "There was a problem logging in"
else
-- the login was successful - give them a new session, and redir to logged in
- self.sessiondata.id = session.random_hash ( 512)
- self.sessiondata.userinfo = t or {}
+ sessiondata.id = session.random_hash ( 512)
+ sessiondata.userinfo = t or {}
self.conf.prefix="/"
self.conf.controller="welcome"
self.conf.action = "read"
self.conf.type = "redir"
- 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 1f9bf9f..f84a92d 100644
--- a/app/acf_www-controller.lua
+++ b/app/acf_www-controller.lua
@@ -34,8 +34,10 @@ mvc.on_load = function (self, parent)
package.path= self.conf.libdir .. "?.lua;" .. package.path
sessionlib=require ("session")
-
+
+
self.sessiondata = {}
+
local tempid = ""
if self.clientdata.sessionid == nil then
self.sessiondata.id = sessionlib.random_hash(512)
@@ -69,11 +71,13 @@ end
mvc.post_exec = function (self)
+ sessionlib=require ("session")
+ -- sessionlib.serialize("s", sessiondata))
if sessiondata.id then
sessionlib.save_session(conf.sessiondir,
sessiondata.id, sessiondata)
end
- -- Close the logfile
+ -- Close the logfile
conf.logfile:close()
end
@@ -143,6 +147,7 @@ view_resolver = function(self)
-- with conf, and other "missing" parts pointing back
-- to APP or self
-- ***************************************************
+
local m,worker_loaded,model_loaded = self:new("alpine-baselayout/hostname")
local alpineversion = self:new("alpine-baselayout/alpineversion")
@@ -198,6 +203,7 @@ end
exception_handler = function (self, message )
local html = require ("html")
+ mvc.post_exec (self)
if type(message) == "table" then
if message.type == "redir" then
io.write ("Status: 302 Moved\n")