diff options
author | Ted Trask <ttrask01@yahoo.com> | 2010-10-08 08:44:17 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2010-10-08 08:44:17 +0000 |
commit | 833bd939caeb57d01748dd694f48b3b4b4866fb3 (patch) | |
tree | 33f49574e67bd0203ac681e7c93a64fa48115a7e | |
parent | 5e1a3b04a150b4e9c7ddda68d9158ac6a0385dbc (diff) | |
download | acf-did-833bd939caeb57d01748dd694f48b3b4b4866fb3.tar.bz2 acf-did-833bd939caeb57d01748dd694f48b3b4b4866fb3.tar.xz |
Modified permissions to work with acf-core-0.11.0
-rw-r--r-- | did-model.lua | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/did-model.lua b/did-model.lua index 2fa6bf9..6b6ed7d 100644 --- a/did-model.lua +++ b/did-model.lua @@ -806,10 +806,10 @@ local function getallowedlist(self, userid) restricted, allowedlist = parseentry(entry) -- also check to see if there are allowed files for this user's roles - local rols = authenticator.get_userinfo_roles(self, userid) + local userinfo = authenticator.get_userinfo(self, userid) -- add in the guest role - rols.value[#rols.value + 1] = roles.guest_role - for i,role in ipairs(rols.value) do + userinfo.roles[#userinfo.roles + 1] = roles.guest_role + for i,role in ipairs(userinfo.roles) do local entry = authenticator.auth.read_entry(self, authenticator.roletable, self.conf.prefix..self.conf.controller, role) or "" local restricted2, allowed2 restricted2, allowed2 = parseentry(entry) @@ -1308,15 +1308,11 @@ local function validatepermissions(permissions) end local function validateuserpermissions(self, userpermissions) - local success = false - userpermissions.value.userid.errtxt = "Invalid user" - local users = authenticator.list_users(self) - for i,user in ipairs(users) do - if userpermissions.value.userid.value == user then - userpermissions.value.userid.errtxt = nil - success = true - break - end + local success = true + local userinfo = authenticator.get_userinfo(self, userpermissions.value.userid.value) + if not userinfo then + userpermissions.value.userid.errtxt = "Invalid user" + success = false end success = validatepermissions(userpermissions) and success return success, userpermissions |