From 833bd939caeb57d01748dd694f48b3b4b4866fb3 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Fri, 8 Oct 2010 08:44:17 +0000
Subject: Modified permissions to work with acf-core-0.11.0

---
 did-model.lua | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'did-model.lua')

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
-- 
cgit v1.2.3