summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2013-10-09 20:55:27 +0000
committerTed Trask <ttrask01@yahoo.com>2014-02-04 16:50:13 +0000
commit44560e46a781bd906c6b64966f3e4c58162df767 (patch)
treea898a5494da9abc42c5f12c01c3650c8d69b4291
parent78c88843fbdb0cb1cd51e9299c18ec729044ec47 (diff)
downloadacf-kamailio-44560e46a781bd906c6b64966f3e4c58162df767.tar.bz2
acf-kamailio-44560e46a781bd906c6b64966f3e4c58162df767.tar.xz
Change use of require to work with Lua 5.2
(cherry picked from commit db68ed71e71fc443d47cea8c9c91b0302e8339ec) Conflicts: kamailio-listtables-html.lsp kamailio-model.lua kamailio-viewtable-html.lsp
-rw-r--r--kamailio-listfiles-html.lsp2
-rw-r--r--kamailio-listusers-html.lsp2
-rw-r--r--kamailio-model.lua6
-rw-r--r--kamailio-searchdatabase-html.lsp2
4 files changed, 6 insertions, 6 deletions
diff --git a/kamailio-listfiles-html.lsp b/kamailio-listfiles-html.lsp
index e99c936..d63398c 100644
--- a/kamailio-listfiles-html.lsp
+++ b/kamailio-listfiles-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("htmlviewfunctions")
+htmlviewfunctions = require("htmlviewfunctions")
html = require("acf.html")
%>
diff --git a/kamailio-listusers-html.lsp b/kamailio-listusers-html.lsp
index d5ea4f9..c631716 100644
--- a/kamailio-listusers-html.lsp
+++ b/kamailio-listusers-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% htmlviewfunctions.displaycommandresults({"deleteuser", "updateuser"}, session) %>
diff --git a/kamailio-model.lua b/kamailio-model.lua
index abfd19b..103890f 100644
--- a/kamailio-model.lua
+++ b/kamailio-model.lua
@@ -1,9 +1,9 @@
local mymodule = {}
-- Load libraries
-require("posix")
-require("modelfunctions")
-require("dbmodelfunctions")
+posix = require("posix")
+modelfunctions = require("modelfunctions")
+dbmodelfunctions = require("dbmodelfunctions")
fs = require("acf.fs")
format = require("acf.format")
validator = require("acf.validator")
diff --git a/kamailio-searchdatabase-html.lsp b/kamailio-searchdatabase-html.lsp
index e2538fb..8a55f48 100644
--- a/kamailio-searchdatabase-html.lsp
+++ b/kamailio-searchdatabase-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("htmlviewfunctions")
+htmlviewfunctions = require("htmlviewfunctions")
html = require("acf.html")
%>