summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorNathan Angelacos <nangel@tetrasec.net>2007-12-21 21:46:59 +0000
committerNathan Angelacos <nangel@tetrasec.net>2007-12-21 21:46:59 +0000
commitc2eda0afa22faa16595fe71f60bfd21ee57b6287 (patch)
treeb17af468b2d47c93df17f7c1ccaa21fa84aa28a8 /app
parent823449a1a5c5c20cba5f385bf23fba0cbd6048c7 (diff)
downloadacf-core-c2eda0afa22faa16595fe71f60bfd21ee57b6287.tar.bz2
acf-core-c2eda0afa22faa16595fe71f60bfd21ee57b6287.tar.xz
logon updates
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@446 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'app')
-rw-r--r--app/acf-util/logon-controller.lua3
-rw-r--r--app/acf-util/logon-model.lua2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua
index f641d33..676736f 100644
--- a/app/acf-util/logon-controller.lua
+++ b/app/acf-util/logon-controller.lua
@@ -39,7 +39,7 @@ logon = function(self)
logevent ("Logon was successful for " .. session.userinfo.username or "" )
error (self.conf)
end
- else
+ end
-- If we reach this point, just give them the login page
return ( cfe ({type="form",
option={ script=ENV["SCRIPT_NAME"],
@@ -47,7 +47,6 @@ logon = function(self)
controller = self.conf.controller,
action = "logon" },
value = { userid, password, logon } }))
- end
end
diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua
index 6e8384d..3c89a2a 100644
--- a/app/acf-util/logon-model.lua
+++ b/app/acf-util/logon-model.lua
@@ -29,7 +29,7 @@ logon = function (self, id, password )
if auth.authenticate (self, id, password) then
return auth.get_userinfo (self, id)
else
- return false
+ return nil
end
end