Remove clientdata processing from logon-model

git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1207 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 9 insertions, 8 deletions

diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua
index b83da37..e3a84df 100644
--- a/app/acf-util/logon-controller.lua
+++ b/app/acf-util/logon-controller.lua
@@ -10,9 +10,10 @@ logon = function(self)
 	local password = cfe({ label="Password" })
 	local cmdresult = cfe({ type="form", value={userid=userid, password=password}, label="Logon", option="Logon" })
 	if clientdata.Logon then
-		local logon = self.model:logon(clientdata, conf.clientip, conf.sessiondir, sessiondata)
+		local logon = self.model:logon(clientdata.userid, clientdata.password, conf.clientip, conf.sessiondir, sessiondata)
 		-- If successful logon, redirect to welcome-page, otherwise try again
 		if logon.value then
+			cmdresult.descr = "Logon Successful"
 			redirect(self, "/welcome/read")
 		else
 			cmdresult.errtxt = "Logon Attempt Failed"
diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua
index 8fa9e12..3644a09 100644
--- a/app/acf-util/logon-model.lua
+++ b/app/acf-util/logon-model.lua
@@ -34,15 +34,15 @@ end
 
 -- Log on new user if possible and set up userinfo in session
 -- if we fail, we leave the session alone (don't log out)
-logon = function (self, clientdata, ip_addr, sessiondir, sessiondata)
+logon = function (self, userid, password, ip_addr, sessiondir, sessiondata)
 	-- Check to see if we can login this user id / ip addr
-	local countevent = session.count_events(sessiondir, clientdata.userid, session.hash_ip_addr(ip_addr))
+	local countevent = session.count_events(sessiondir, userid, session.hash_ip_addr(ip_addr))
 	if countevent then
-		session.record_event(sessiondir, clientdata.userid, session.hash_ip_addr(ip_addr))
+		session.record_event(sessiondir, userid, session.hash_ip_addr(ip_addr))
 	end
 
-	if false == countevent and clientdata.userid and clientdata.password then
-		if auth.authenticate (self, clientdata.userid, clientdata.password) then
+	if false == countevent and userid and password then
+		if auth.authenticate (self, userid, password) then
 			-- We have a successful login, change sessiondata
 			-- for some reason, can't call this function or it skips rest of logon
 			-- logout(sessiondir, sessiondata)
@@ -54,12 +54,12 @@ logon = function (self, clientdata, ip_addr, sessiondir, sessiondata)
 			end
 			--]]
 			sessiondata.id = session.random_hash(512)
-			local t = auth.get_userinfo (self, clientdata.userid)
+			local t = auth.get_userinfo (self, userid)
 			sessiondata.userinfo = t or {}
 			return cfe({ type="boolean", value=true, label="Logon Success" })
 		else
 			-- We have a bad login, log the event
-			session.record_event(sessiondir, clientdata.userid, session.hash_ip_addr(ip_addr))
+			session.record_event(sessiondir, userid, session.hash_ip_addr(ip_addr))
 		end
 	end
 	return cfe({ type="boolean", value=false, label="Logon Success" })