diff options
| -rw-r--r-- | app/acf_www-controller.lua | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 445d03a..6dbc9e0 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -48,18 +48,14 @@ local temp = format.string_to_table(roll.get_roles_perm(self,p),",") sessiondata.menu.mainmenu[a].match = "yes" end end - if sessiondata.menu.mainmenu[a].match == "no" then --- table.remove(sessiondata.menu.mainmenu,a) end - print("yes") - end end else --we don't need to figure out what permission have it is in sessiondata local temp = format.string_to_table(sessiondata.userinfo.perm,",") - for a,b in pairs(sessiondate.menu.mainmenu) do + for a,b in pairs(sessiondata.menu.mainmenu) do for e,f in pairs(temp) do local control,acti = string.match(f,"(%a+):(%a+)") - if sessiondate.menu.mainmenu[a].controller == control then + if sessiondata.menu.mainmenu[a].controller == control then if sessiondata.menu.mainmenu[a].action == acti then sessiondata.menu.mainmenu[a].match = "yes" break @@ -72,14 +68,15 @@ else if sessiondata.menu.mainmenu[a].controller == "menuhints" then sessiondata.menu.mainmenu[a].match = "yes" end - if sessiondata.menu.mainmenu[a].match == "no" then - --table.remove(sessiondata.menu.mainmenu,a) - print("yes") - end end end end + for a,b in pairs(sessiondata.menu.mainmenu) do + if sessiondata.menu.mainmenu[a].match == "no" then + sessiondata.menu.mainmenu[a] = nil + end + end -- Debug: Timestamp on menu creation sessiondata.menu.timestamp = {tab="Menu_created: " .. os.date(),action="Menu_created: " .. os.date(),} @@ -112,19 +109,19 @@ mvc.on_load = function (self, parent) if self.clientdata.sessionid == nil then self.sessiondata.id = sessionlib.random_hash(512) tempid = self.sessiondata.id - --build_menus(self) + build_menus(self) else local timestamp tempid = self.clientdata.sessionid timestamp, self.sessiondata = sessionlib.load_session(self.conf.sessiondir, self.clientdata.sessionid) - -- build_menus(self) + build_menus(self) if timestamp == nil then self.sessiondata.id = tempid sessionlib.record_event(self.conf.sessiondir, sessionlib.hash_ip_addr(self.conf.clientip)) - -- build_menus(self) + build_menus(self) else -- FIXME: This is probably wrong place to generate the menus |