1 files changed, 81 insertions, 10 deletions
diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua
index b6e95fd..4fe3cbf 100644
--- a/app/acf-util/roles-model.lua
+++ b/app/acf-util/roles-model.lua
@@ -1,20 +1,91 @@
--- Roles/Group  model functions
-
-require ("roles")
-
+-- Roles/Group functions
 module (..., package.seeall)
 
-getcont = function(self)
-	--need to get a list of all the controllers
+auth = require("authenticator-plaintext")
+require("roles")
+
+local get_all_permissions = function(self)
+	-- need to get a list of all the controllers
 	controllers = roles.get_controllers(self)
-	local table_m = {}
+	local table_perm = {}
+	local array_perm = {}
 	for a,b in pairs(controllers) do
-		table_m[b.sname] = {}
+		if nil == table_perm[b.sname] then
+			table_perm[b.sname] = {}
+		end
 		temp = roles.get_controllers_func(self,b)
 		for x,y in ipairs(temp) do
-			table_m[b.sname][y] = {}
+			table_perm[b.sname][y] = {}
+			array_perm[#array_perm + 1] = b.sname .. ":" .. y
+		end
+	end
+
+	return table_perm, array_perm
+end
+
+-- Return roles/permissions for specified user
+get_user_roles = function(self, userid)
+	rls = cfe({ type="list", value=auth.get_userinfo_roles(self, userid), label="Roles" })
+	permissions = cfe({ type="table", value=roles.get_roles_perm(self.conf.appdir, rls.value), label="Permissions" })
+	return cfe({ type="group", value={roles=rls, permissions=permissions} })
+end
+
+-- Return permissions for specified role
+get_role_perms = function(self, role)
+	return cfe({ type="table", value=roles.get_role_perm(self.conf.appdir, role), label="Permissions" })
+end
+	
+-- Return list of all permissions
+get_perms_list = function()
+	return cfe({ type="table", value=get_all_permissions(self), label="All Permissions" })
+end
+
+view_roles = function()
+	local defined_roles, default_roles = roles.list_roles()
+	local defined_roles_cfe=cfe({ type="list", value=defined_roles, label="Locally-defined roles" })
+	local default_roles_cfe=cfe({ type="list", value=default_roles, label="System-defined roles" })
+
+	return cfe({ type="group", value={defined_roles=defined_roles_cfe, default_roles=default_roles_cfe} })
+end
+
+setpermissions = function(self, role, permissions, newrole)
+	local errtxt
+	local my_perms = {}
+	if permissions then
+		-- we're changing permissions
+		local result = true
+		if newrole then
+			-- make sure not overwriting role
+			for x,ro in ipairs(roles.list_roles()) do
+				if role==ro then
+					result = false
+					errtxt = "Role already exists"
+					break
+				end
+			end
+		end
+		if result==true then
+			result, errtxt = roles.set_role_perm(role, nil, permissions)
+		end
+		my_perms = self.clientdata.permissions
+	else
+		if role then
+			tmp, my_perms = roles.get_role_perm(self.conf.appdir, role)
+		else
+			role = ""
 		end
 	end
 
-	return cfe({ type="table", value=table_m, label="All permissions" })
+	local tmp, all_perms = get_all_permissions(self)
+	table.sort(all_perms)
+	
+	local permissions_cfe = cfe({ type="multi", value=my_perms, option=all_perms, label="Role permissions" })
+	local role_cfe = cfe({ value=role, label="Role", errtxt=errtxt })
+
+	return cfe({ type="table", value={role=role_cfe, permissions=permissions_cfe} })
+end
+
+delete_role = function(role)
+	local result, cmdresult = roles.delete_role(role)
+	return cfe({ value=cmdresult })
 end