summaryrefslogtreecommitdiffstats
path: root/app/acf-util
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2013-10-09 19:24:30 +0000
committerTed Trask <ttrask01@yahoo.com>2013-10-09 19:24:30 +0000
commitfcaab1b363fcd5ff2dccce8f98cacabc5635ba5f (patch)
treecd28bbb1bc80b0a36de234768fd6f3b75b8fcc9c /app/acf-util
parente07736354b22bef2599d1831a6ba435808c0630d (diff)
downloadacf-core-fcaab1b363fcd5ff2dccce8f98cacabc5635ba5f.tar.bz2
acf-core-fcaab1b363fcd5ff2dccce8f98cacabc5635ba5f.tar.xz
Change use of require to work with Lua 5.2
Diffstat (limited to 'app/acf-util')
-rw-r--r--app/acf-util/logon-model.lua6
-rw-r--r--app/acf-util/password-controller.lua2
-rw-r--r--app/acf-util/password-model.lua4
-rw-r--r--app/acf-util/password-status-html.lsp2
-rw-r--r--app/acf-util/roles-model.lua6
-rw-r--r--app/acf-util/roles-viewroles-html.lsp2
-rw-r--r--app/acf-util/skins-model.lua2
-rw-r--r--app/acf-util/skins-read-html.lsp2
-rw-r--r--app/acf-util/welcome-html.lsp2
9 files changed, 14 insertions, 14 deletions
diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua
index 833d665..fd67ec2 100644
--- a/app/acf-util/logon-model.lua
+++ b/app/acf-util/logon-model.lua
@@ -2,11 +2,11 @@
module (..., package.seeall)
-require ("session")
+session = require ("session")
html = require ("acf.html")
fs = require ("acf.fs")
-require ("roles")
-require ("authenticator")
+roles = require ("roles")
+authenticator = require ("authenticator")
-- Logoff the user by deleting session data
logoff = function (sessiondir, sessiondata)
diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua
index 6518249..40ba61b 100644
--- a/app/acf-util/password-controller.lua
+++ b/app/acf-util/password-controller.lua
@@ -1,5 +1,5 @@
module(..., package.seeall)
-require("roles")
+roles = require("roles")
default_action = "editme"
diff --git a/app/acf-util/password-model.lua b/app/acf-util/password-model.lua
index b9cafb9..a329c19 100644
--- a/app/acf-util/password-model.lua
+++ b/app/acf-util/password-model.lua
@@ -1,7 +1,7 @@
module(..., package.seeall)
-require("authenticator")
-require("roles")
+authenticator = require("authenticator")
+roles = require("roles")
avail_roles, avail_skins, avail_homes = nil
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 762136b..f322b55 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% htmlviewfunctions.displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua
index 2181a70..4d5d1d3 100644
--- a/app/acf-util/roles-model.lua
+++ b/app/acf-util/roles-model.lua
@@ -1,9 +1,9 @@
-- Roles/Group functions
module (..., package.seeall)
-require("modelfunctions")
-require("authenticator")
-require("roles")
+modelfunctions = require("modelfunctions")
+authenticator = require("authenticator")
+roles = require("roles")
-- Return roles/permissions for specified user
get_user_roles = function(self, userid)
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 9a3be5d..779d8fc 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session= ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% htmlviewfunctions.displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
diff --git a/app/acf-util/skins-model.lua b/app/acf-util/skins-model.lua
index b717de6..e646af9 100644
--- a/app/acf-util/skins-model.lua
+++ b/app/acf-util/skins-model.lua
@@ -1,6 +1,6 @@
module (..., package.seeall)
-require("modelfunctions")
+modelfunctions = require("modelfunctions")
fs = require("acf.fs")
format = require("acf.format")
diff --git a/app/acf-util/skins-read-html.lsp b/app/acf-util/skins-read-html.lsp
index 50581af..dff5ae2 100644
--- a/app/acf-util/skins-read-html.lsp
+++ b/app/acf-util/skins-read-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% htmlviewfunctions.displaycommandresults({"update"}, session) %>
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 6a1fc17..7540b94 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -1,5 +1,5 @@
<% view = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<h1>Alpine Configuration Framework</h1>
<DL><p>Welcome.</p></DL>