diff options
| -rw-r--r-- | acf-hooks.lua | 2 | ||||
| -rw-r--r-- | app/acf-util/logon-model.lua | 4 | ||||
| -rw-r--r-- | app/acf-util/skins-model.lua | 4 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 2 | ||||
| -rw-r--r-- | app/template-html.lsp | 2 | ||||
| -rw-r--r-- | lib/authenticator.lua | 2 | ||||
| -rw-r--r-- | lib/menubuilder.lua | 2 | ||||
| -rw-r--r-- | lib/modelfunctions.lua | 6 | ||||
| -rw-r--r-- | lib/roles.lua | 4 | ||||
| -rw-r--r-- | lib/viewfunctions.lua | 2 | ||||
| -rw-r--r-- | www/cgi-bin/mvc.lua | 5 |
11 files changed, 16 insertions, 19 deletions
diff --git a/acf-hooks.lua b/acf-hooks.lua index bae047e..b301c5d 100644 --- a/acf-hooks.lua +++ b/acf-hooks.lua @@ -15,7 +15,7 @@ -- self, CONFFILE, and TEMPFILE -- Example of a general logging function -require("format") +format = require("acf.format") local precommit=function(self, conf, temp) local logfile = "/var/log/acf-" .. self.conf.controller .. ".log" fs.write_line_file (logfile, "#---- BEGIN TRANSACTION - " .. diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua index 41cc0e0..40a533e 100644 --- a/app/acf-util/logon-model.lua +++ b/app/acf-util/logon-model.lua @@ -3,8 +3,8 @@ module (..., package.seeall) require ("session") -require ("html") -require ("fs") +html = require ("acf.html") +fs = require ("acf.fs") require ("roles") require ("authenticator") diff --git a/app/acf-util/skins-model.lua b/app/acf-util/skins-model.lua index 9be9c72..eda6870 100644 --- a/app/acf-util/skins-model.lua +++ b/app/acf-util/skins-model.lua @@ -1,7 +1,7 @@ module (..., package.seeall) -require("fs") -require("format") +fs = require("acf.fs") +format = require("acf.format") local function set_skins(self, skin) local content = "\n"..(fs.read_file(self.conf.conffile) or "") diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 3aeded5..b4f8e91 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -294,7 +294,7 @@ end -- Overload the MVC's exception handler with our own to handle redirection exception_handler = function (self, message ) - local html = require ("html") + local html = require ("acf.html") local viewtable if type(message) == "table" then if self.conf.component == true then diff --git a/app/template-html.lsp b/app/template-html.lsp index dfd0206..a37a31e 100644 --- a/app/template-html.lsp +++ b/app/template-html.lsp @@ -1,5 +1,5 @@ <% local viewtable, viewlibrary, pageinfo, session = ... - html=require("html") %> + html=require("acf.html") %> Status: 200 OK Content-Type: text/html <% if (session.id) then diff --git a/lib/authenticator.lua b/lib/authenticator.lua index 43814c1..8a16d07 100644 --- a/lib/authenticator.lua +++ b/lib/authenticator.lua @@ -4,7 +4,7 @@ module (..., package.seeall) require("modelfunctions") -require("format") +format = require("acf.format") require("md5") require("posix") require("session") diff --git a/lib/menubuilder.lua b/lib/menubuilder.lua index 2606fb7..1b8e23b 100644 --- a/lib/menubuilder.lua +++ b/lib/menubuilder.lua @@ -6,7 +6,7 @@ module(..., package.seeall) require("posix") -require("format") +format = require("acf.format") -- returns a table of the "*.menu" tables -- startdir should be the app dir. diff --git a/lib/modelfunctions.lua b/lib/modelfunctions.lua index 0004676..004a326 100644 --- a/lib/modelfunctions.lua +++ b/lib/modelfunctions.lua @@ -1,9 +1,9 @@ module(..., package.seeall) -- Load libraries -require("fs") -require("format") -require("processinfo") +fs = require("acf.fs") +format = require("acf.format") +processinfo = require("acf.processinfo") function getenabled(processname) local result = cfe({ label = "Program status", name=processname }) diff --git a/lib/roles.lua b/lib/roles.lua index 0cfd382..78833e3 100644 --- a/lib/roles.lua +++ b/lib/roles.lua @@ -1,8 +1,8 @@ --this module is for authorization help and group/role management require ("authenticator") -require ("fs") -require ("format") +fs = require ("acf.fs") +format = require ("acf.format") module (..., package.seeall) diff --git a/lib/viewfunctions.lua b/lib/viewfunctions.lua index 517023a..e447fc3 100644 --- a/lib/viewfunctions.lua +++ b/lib/viewfunctions.lua @@ -1,4 +1,4 @@ -require("html") +html = require("acf.html") require("session") function getlabel(myitem, value) diff --git a/www/cgi-bin/mvc.lua b/www/cgi-bin/mvc.lua index e34f857..ac784e5 100644 --- a/www/cgi-bin/mvc.lua +++ b/www/cgi-bin/mvc.lua @@ -1,7 +1,4 @@ - --- require("acf.fs") -local fs = require("fs") - +fs = require("acf.fs") fs.write_line_file("/var/log/acf.log", "WARNING: old mvc.lua was used") mvc = require("acf.mvc") |