diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-01-21 15:14:00 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-01-21 15:14:00 +0000 |
| commit | cd186cf6d5b7b775001f919797e7c621661ea2fa (patch) | |
| tree | bf6f14bc15aebfd3d20c733079e8954daf253777 /app | |
| parent | 8cbd5764dc499274a0fd2f97717dfa1de121788a (diff) | |
| download | acf-core-cd186cf6d5b7b775001f919797e7c621661ea2fa.tar.bz2 acf-core-cd186cf6d5b7b775001f919797e7c621661ea2fa.tar.xz | |
Modified require statements for acf.x
Diffstat (limited to 'app')
| -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 |
4 files changed, 6 insertions, 6 deletions
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 |