From 25204ba6ee44fdbd9288f3953ca63dcbb81b2167 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Fri, 1 Jan 2010 16:42:00 +0000 Subject: Use viewlibrary.check_permission from acf-core-0.9.0, dirname function is no longer in acf-core-0.9.0 --- kamailio-listusers-html.lsp | 12 ++++++------ kamailio-model.lua | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kamailio-listusers-html.lsp b/kamailio-listusers-html.lsp index 0c010c5..5994b79 100644 --- a/kamailio-listusers-html.lsp +++ b/kamailio-listusers-html.lsp @@ -8,7 +8,7 @@
- <% if session.permissions[page_info.controller].deleteuser or session.permissions[page_info.controller].updateuser then %> + <% if viewlibrary.check_permission("deleteuser") or viewlibrary.check_permission("updateuser") then %> <% end %> @@ -17,18 +17,18 @@ <% for i,user in ipairs(form.value) do %> - <% if session.permissions[page_info.controller].deleteuser or session.permissions[page_info.controller].updateuser then %> + <% if viewlibrary.check_permission("deleteuser") or viewlibrary.check_permission("updateuser") then %> <% end %> - <% if session.permissions[page_info.controller].updateuser then %> + <% if viewlibrary.check_permission("updateuser") then %> <% else %> @@ -38,6 +38,6 @@
ActionUser Name
- <% if session.permissions[page_info.controller].updateuser then %> + <% if viewlibrary.check_permission("updateuser") then %> <%= html.link{value = "updateuser?username=" .. user.username.."&redir="..page_info.orig_action, label="Update "} %> <% end %> - <% if session.permissions[page_info.controller].deleteuser then %> + <% if viewlibrary.check_permission("deleteuser") then %> <%= html.link{value = "deleteuser?username=" .. user.username, label="Delete "} %> <% end %> <%= html.html_escape(user.username) %><%= html.html_escape(user.password) %>******
-<% if viewlibrary and viewlibrary.dispatch_component and session.permissions[page_info.controller].createuser then +<% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createuser") then viewlibrary.dispatch_component("createuser") end %> diff --git a/kamailio-model.lua b/kamailio-model.lua index 53cb29a..8d4ec97 100644 --- a/kamailio-model.lua +++ b/kamailio-model.lua @@ -1,6 +1,7 @@ module(..., package.seeall) -- Load libraries +require("posix") require("modelfunctions") require("fs") require("format") @@ -17,7 +18,7 @@ local path = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin -- LOCAL FUNCTIONS local is_valid_filename = function(filename) - local dirname = dirname(filename) + local dirname = posix.dirname(filename) return validator.is_valid_filename(filename) and string.match(dirname, baseurl) and not string.match(dirname, "%.%.") end -- cgit v1.2.3