summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMike Mason <ms13sp@gmail.com>2008-02-05 21:35:03 +0000
committerMike Mason <ms13sp@gmail.com>2008-02-05 21:35:03 +0000
commit13c4b25ab45c2ab897140fbafa59eafb9cacf000 (patch)
tree30bff1e2dc667de38032ba5880b893f76d584104 /app
parent91653931e66a76d5b135398a0e022af18e087491 (diff)
downloadacf-core-13c4b25ab45c2ab897140fbafa59eafb9cacf000.tar.bz2
acf-core-13c4b25ab45c2ab897140fbafa59eafb9cacf000.tar.xz
Added the full roles to the sessiondata.
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@696 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'app')
-rw-r--r--app/acf-util/logon-model.lua2
-rw-r--r--app/acf-util/roles-model.lua4
-rw-r--r--app/acf-util/roles-read-html.lsp9
3 files changed, 11 insertions, 4 deletions
diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua
index a86d361..ff5515a 100644
--- a/app/acf-util/logon-model.lua
+++ b/app/acf-util/logon-model.lua
@@ -5,6 +5,7 @@ module (..., package.seeall)
require ("session")
require ("html")
require ("fs")
+require ("roles")
--varibles for time in case of logons,expired,lockouts
minutes_expired_events=30
@@ -56,6 +57,7 @@ session.expired_events(conf.sessiondir, minutes_expired_events)
local t = auth.get_userinfo (self, id_user)
sessiondata.id = session.random_hash(512)
sessiondata.userinfo = t or {}
+ sessiondata.userinfo.perm = roles.get_roles_perm(self,auth.get_userinfo_roles(self,id_user))
self.conf.prefix="/acf-util/"
self.conf.action="status"
self.conf.type="redir"
diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua
index dbfff35..b4641dc 100644
--- a/app/acf-util/roles-model.lua
+++ b/app/acf-util/roles-model.lua
@@ -7,7 +7,9 @@ module (..., package.seeall)
read = function(self,sessionid)
useid , theroles = session.check_session(conf.sessiondir,sessionid,"roles")
- return ( cfe { value=theroles,name="roles" })
+--we need to expand roles to give us real perm list
+ perm = roles.get_roles_perm(self,theroles)
+ return ( cfe { userid={value=useid,name="userid"},roles={ value=theroles,name="roles"}, perm={value=perm,name="perm"} })
end
getcont = function(self)
diff --git a/app/acf-util/roles-read-html.lsp b/app/acf-util/roles-read-html.lsp
index ec6e965..c5ea541 100644
--- a/app/acf-util/roles-read-html.lsp
+++ b/app/acf-util/roles-read-html.lsp
@@ -1,8 +1,11 @@
<? local view= ... ?>
<h1>Role Views</h1>
+<p>Roles/Permission list for <?= view.read.userid.value ?>:<p>
+
<p>You are valid in these role <p>
-<? for a,b in pairs(view.read.value) do ?>
-<li><?= b ?><br>
-<? end ?>
+<? for a,b in pairs(view.read.roles.value) do
+print("<li>",b) end ?>
+<p>Your full permissions are<p>
+<?= view.read.perm.value ?>
<?= html.cfe_unpack(view) ?>