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.

1 files changed, 8 insertions, 6 deletions

diff --git a/modules-model.lua b/modules-model.lua
index 74f8384..0a55140 100644
--- a/modules-model.lua
+++ b/modules-model.lua
@@ -1,24 +1,24 @@
-module (..., package.seeall)
+local mymodule = {}
 
 modelfunctions = require("modelfunctions")
 fs = require("acf.fs")
 
 local configfile = "/etc/modules"
 
-function read_modules()
+function mymodule.read_modules()
 	local retval = modelfunctions.run_executable({"lsmod"})
 	return cfe({ type="longtext", value=retval, label="Modules List" })
 end
 
-function read_file()
+function mymodule.read_file()
 	return modelfunctions.getfiledetails(configfile)
 end
 
-function write_file(self, filedetails)
+function mymodule.write_file(self, filedetails)
 	return modelfunctions.setfiledetails(self, filedetails, {configfile})
 end
 
-function get_reloadmodules(self, clientdata)
+function mymodule.get_reloadmodules(self, clientdata)
 	local actions = {}
 	actions[1] = "restart"
 	local service = cfe({ type="hidden", value="modules", label="Service Name" })
@@ -27,6 +27,8 @@ function get_reloadmodules(self, clientdata)
 	return startstop
 end
 
-function reloadmodules(self, startstop)
+function mymodule.reloadmodules(self, startstop)
 	return modelfunctions.startstop_service(startstop, "restart")
 end
+
+return mymodule