diff options
author | Ted Trask <ttrask01@yahoo.com> | 2013-10-18 20:13:46 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2013-10-18 20:13:46 +0000 |
commit | 5f9f108ea479a5bfea59e96802206851c6430ebe (patch) | |
tree | 6976f7d07f49f45ba1dd3a73e16d5a35c57f7c67 /dansguardian-model.lua | |
parent | bdabdb5ecb5744d011000ec058947ea331b9732e (diff) | |
download | acf-dansguardian-5f9f108ea479a5bfea59e96802206851c6430ebe.tar.bz2 acf-dansguardian-5f9f108ea479a5bfea59e96802206851c6430ebe.tar.xz |
Remove all calls to 'module' in preparation for move to Lua 5.2
Use mymodule parameter for module definition.
This was also helpful in revealing places where the code relied on the global environment.
Diffstat (limited to 'dansguardian-model.lua')
-rw-r--r-- | dansguardian-model.lua | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/dansguardian-model.lua b/dansguardian-model.lua index 8362ce0..8359f6c 100644 --- a/dansguardian-model.lua +++ b/dansguardian-model.lua @@ -1,5 +1,5 @@ -- Copyright(c) 2007 A. Brodmann - Licensed under terms of GPL2 -module (..., package.seeall) +local mymodule = {} -- Load libraries modelfunctions = require("modelfunctions") @@ -78,19 +78,19 @@ end -- ################################################################################ -- PUBLIC FUNCTIONS -get_status = function() +mymodule.get_status = function() return modelfunctions.getstatus(processname, packagename, "Dans Guardian Status") end -function get_startstop(self, clientdata) +function mymodule.get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end -function startstop_service(self, startstop, action) +function mymodule.startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end -read_general_config = function() +mymodule.read_general_config = function() local retval = { filterip = cfe({ label="Filter IP", descr="Leave blank to listen on all IPs" }), filterport = cfe({ label="Filter Port" }), proxyip = cfe({ label="Proxy IP" }), @@ -116,7 +116,7 @@ read_general_config = function() return cfe({ type="group", value=retval, label="Dansguardian General Config" }) end -update_general_config = function(self, config) +mymodule.update_general_config = function(self, config) local success, config = validate_general_config(config) if success then @@ -139,15 +139,15 @@ update_general_config = function(self, config) return config end -get_file = function(filename) +mymodule.get_file = function(filename) return modelfunctions.getfiledetails(filename, is_valid_filename) end -update_file = function(self, filedetails) +mymodule.update_file = function(self, filedetails) return modelfunctions.setfiledetails(self, filedetails, is_valid_filename) end -list_files = function() +mymodule.list_files = function() local retval = {} for file in fs.find(null, baseurl) do local details = fs.stat(file) @@ -160,7 +160,7 @@ list_files = function() return cfe({ type="structure", value=retval, label="List of Dansguardian files" }) end -list_config_files = function() +mymodule.list_config_files = function() local list = {} local details = fs.stat(dansguardiancfg) or {} list[1] = { filename=dansguardiancfg, size = details.size or 0, mtime = details.mtime or "---" } @@ -260,3 +260,5 @@ get_category = function(category, object) return retval end --]] + +return mymodule |