diff options
| -rw-r--r-- | app/acf_cli-controller.lua | 1 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 1 | ||||
| -rw-r--r-- | lib/Makefile | 1 | ||||
| -rw-r--r-- | lib/README | 1 | ||||
| -rw-r--r-- | lib/cfe.lua | 15 | ||||
| -rw-r--r-- | lib/html.lua | 2 | ||||
| -rwxr-xr-x | www/cgi-bin/mvc.lua | 14 |
7 files changed, 15 insertions, 20 deletions
diff --git a/app/acf_cli-controller.lua b/app/acf_cli-controller.lua index 672af25..60d9a9e 100644 --- a/app/acf_cli-controller.lua +++ b/app/acf_cli-controller.lua @@ -16,7 +16,6 @@ mvc.on_load = function (self, parent) -- this sets the package path for us and our children package.path= self.conf.libdir .. "?.lua;" .. package.path - require ("cfe") self.session = {} local x=require("session") diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index dad0026..6f114b6 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -226,7 +226,6 @@ mvc.on_load = function (self, parent) -- this sets the package path for us and our children package.path= self.conf.libdir .. "?.lua;" .. package.path - require ("cfe") sessionlib=require ("session") diff --git a/lib/Makefile b/lib/Makefile index bd14934..409cf4e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -17,7 +17,6 @@ LIB_DIST=fs.lua\ viewfunctions.lua\ controllerfunctions.lua\ modelfunctions.lua\ - cfe.lua\ apk.lua\ EXTRA_DIST=README Makefile @@ -13,7 +13,6 @@ authenticator-plaintext.lua - Used to parse through the username:password file a validator.lua - Validate web input for ACF. html.lua - Helps with form building in ACF. menubuilder.lua -Helps create the menus on left window in ACF -web_elements.lua - More web functionality for ACF. privsep.lua - Helps with authorization with ACF session.lua -Helps with Session mangement in ACF diff --git a/lib/cfe.lua b/lib/cfe.lua deleted file mode 100644 index 34a249d..0000000 --- a/lib/cfe.lua +++ /dev/null @@ -1,15 +0,0 @@ -module(..., package.seeall) - --- create a Configuration Framework Entity (cfe) --- returns a table with at least "value", "type", and "label" -cfe = function ( optiontable ) - optiontable = optiontable or {} - me = { value="", - type="text", - label="" } - for key,value in pairs(optiontable) do - me[key] = value - end - return me -end -_G.cfe = cfe diff --git a/lib/html.lua b/lib/html.lua index de69046..d6f968a 100644 --- a/lib/html.lua +++ b/lib/html.lua @@ -107,7 +107,7 @@ end --[[ Form functions ]]------------------------------------------------------ --- These expect something like a cfe to work (see acf_www-controller.lua) +-- These expect something like a cfe to work (see mvc.lua) form = {} form.text = function ( v ) diff --git a/www/cgi-bin/mvc.lua b/www/cgi-bin/mvc.lua index 86a1bb4..aef3547 100755 --- a/www/cgi-bin/mvc.lua +++ b/www/cgi-bin/mvc.lua @@ -317,3 +317,17 @@ exception_handler = function (self, message ) print (tostring(message)) end end + +-- create a Configuration Framework Entity (cfe) +-- returns a table with at least "value", "type", and "label" +cfe = function ( optiontable ) + optiontable = optiontable or {} + me = { value="", + type="text", + label="" } + for key,value in pairs(optiontable) do + me[key] = value + end + return me +end +_G.cfe = cfe |