diff options
Diffstat (limited to 'app/acf-util')
| -rw-r--r-- | app/acf-util/acf-util.roles | 4 | ||||
| -rw-r--r-- | app/acf-util/logon-controller.lua | 10 | ||||
| -rw-r--r-- | app/acf-util/logon-model.lua | 10 | ||||
| -rw-r--r-- | app/acf-util/password-controller.lua | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/app/acf-util/acf-util.roles b/app/acf-util/acf-util.roles index c2639cf..8741022 100644 --- a/app/acf-util/acf-util.roles +++ b/app/acf-util/acf-util.roles @@ -1,4 +1,4 @@ -GUEST=logon/logon,logon/logout,logon/status,welcome/read +GUEST=logon/logon,logon/logoff,logon/status,welcome/read USER=password/editme,roles/read EXPERT= -ADMIN=logon/logon,logon/logout,logon/status,password/editme,password/status,password/edituser,password/newuser,password/deleteuser,roles/read,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,welcome/read,password/status,password/edituser,password/newuser,password/deleteuser,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,skins/read,skins/update +ADMIN=logon/logon,logon/logoff,logon/status,password/editme,password/status,password/edituser,password/newuser,password/deleteuser,roles/read,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,welcome/read,password/status,password/edituser,password/newuser,password/deleteuser,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,skins/read,skins/update diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua index 5404dbd..6ac293e 100644 --- a/app/acf-util/logon-controller.lua +++ b/app/acf-util/logon-controller.lua @@ -61,15 +61,15 @@ logon = function(self) return cmdresult end --- Log out current user and go to login screen -logout = function(self) - local logout = self.model.logoff(conf.sessiondir, sessiondata) +-- Log off current user and go to logon screen +logoff = function(self) + local logoff = self.model.logoff(conf.sessiondir, sessiondata) -- We have to redirect so a new session / menu is created redirect(self, "logon") - return logout + return logoff end --- Report the login status +-- Report the logon status status = function(self) local name = cfe({ label="User Name" }) local sessionid = cfe({ value=self.sessiondata.id or "", label="Session ID" }) diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua index 40a533e..833d665 100644 --- a/app/acf-util/logon-model.lua +++ b/app/acf-util/logon-model.lua @@ -22,9 +22,9 @@ logoff = function (sessiondir, sessiondata) 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) +-- if we fail, we leave the session alone (don't log off) logon = function (self, userid, password, ip_addr, sessiondir, sessiondata) - -- Check to see if we can login this user id / ip addr + -- Check to see if we can log on this user id / ip addr local countevent = session.count_events(sessiondir, userid, session.hash_ip_addr(ip_addr), self.conf.lockouttime, self.conf.lockouteventlimit) if countevent then session.record_event(sessiondir, userid, session.hash_ip_addr(ip_addr)) @@ -32,9 +32,9 @@ logon = function (self, userid, password, ip_addr, sessiondir, sessiondata) if false == countevent and userid and password then if authenticator.authenticate (self, userid, password) then - -- We have a successful login, change sessiondata + -- We have a successful logon, change sessiondata -- for some reason, can't call this function or it skips rest of logon - -- logout(sessiondir, sessiondata) + -- logoff(sessiondir, sessiondata) ---[[ so, do this instead session.unlink_session(sessiondir, sessiondata.id) -- Clear the current session data @@ -50,7 +50,7 @@ logon = function (self, userid, password, ip_addr, sessiondir, sessiondata) end return cfe({ type="boolean", value=true, label="Logon Success" }) else - -- We have a bad login, log the event + -- We have a bad logon, log the event session.record_event(sessiondir, userid, session.hash_ip_addr(ip_addr)) end end diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua index c3d8695..6518249 100644 --- a/app/acf-util/password-controller.lua +++ b/app/acf-util/password-controller.lua @@ -18,7 +18,7 @@ function editme(self) local tmp1, tmp2 = roles.get_roles_perm(self, value.value.roles.value) table.sort(tmp2) for i,h in ipairs(tmp2) do - if h ~= "/acf-util/logon/logout" and h ~= "/acf-util/logon/logon" then + if h ~= "/acf-util/logon/logoff" and h ~= "/acf-util/logon/logon" then value.value.home.option[#value.value.home.option+1] = h end end |