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, 17 insertions, 15 deletions

diff --git a/cron-model.lua b/cron-model.lua
index 46081ac..f34689a 100644
--- a/cron-model.lua
+++ b/cron-model.lua
@@ -1,4 +1,4 @@
-module (..., package.seeall)
+local mymodule = {}
 
 posix = require("posix")
 modelfunctions = require("modelfunctions")
@@ -65,37 +65,37 @@ end
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-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
 
-function getstatus()
+function mymodule.getstatus()
 	return modelfunctions.getstatus(processname, packagename, "Cron Status")
 end
 
-function listjobs()
+function mymodule.listjobs()
 	return cfe({ type="structure", value=list_jobs(), label="Cron Jobs" })
 end
 
-function read_job(self, clientdata)
+function mymodule.read_job(self, clientdata)
 	return modelfunctions.getfiledetails(clientdata.name, validate_filename)
 end
 
-function update_job(self, filedetails)
+function mymodule.update_job(self, filedetails)
 	return modelfunctions.setfiledetails(self, filedetails, validate_filename)
 end
 
-function get_delete_job(self, clientdata)
+function mymodule.get_delete_job(self, clientdata)
 	local result = {}
 	result.filename = cfe({ value=clientdata.name or "", label="File Name" })
 	return cfe({ type="group", value=result, label="Delete Cron Job" })
 end
 
-function delete_job(self, deleterequest)
+function mymodule.delete_job(self, deleterequest)
 	deleterequest.errtxt = "Invalid File"
 	if validate_filename(deleterequest.value.filename.value) then
 		os.remove(deleterequest.value.filename.value)
@@ -104,7 +104,7 @@ function delete_job(self, deleterequest)
 	return deleterequest
 end
 
-function get_move_job()
+function mymodule.get_move_job()
 	local move = {}
 	move.name = cfe({ type="select", label="Name", option=select(2, list_jobs()) })
 	move.period = cfe({ type="select", label="Period", option=list_periods() })
@@ -113,7 +113,7 @@ function get_move_job()
 	return cfe({ type="group", value=move, label="Move Job" })
 end
 
-function move_job(self, move)
+function mymodule.move_job(self, move)
 	local success = modelfunctions.validateselect(move.value.name)
 	success = modelfunctions.validateselect(move.value.period) and success
 
@@ -129,7 +129,7 @@ function move_job(self, move)
 	return move
 end
 
-function create_new_job()
+function mymodule.create_new_job()
 	local newjob = {}
 	newjob.name = cfe({ label="Name" })
 	newjob.period = cfe({ type="select", label="Period", option=list_periods() })
@@ -137,7 +137,7 @@ function create_new_job()
 	return cfe({ type="group", value=newjob, label="Create New Job" })
 end
 
-function create_job(self, newjob)
+function mymodule.create_job(self, newjob)
 	local success = modelfunctions.validateselect(newjob.value.period)
 
 	if newjob.value.name.value == "" then
@@ -161,12 +161,14 @@ function create_job(self, newjob)
 	return newjob
 end
 
-function read_configfile()
+function mymodule.read_configfile()
 	-- FIXME validate
  	return modelfunctions.getfiledetails(configfile)
 end
 
-function update_configfile(self, filedetails)
+function mymodule.update_configfile(self, filedetails)
 	-- FIXME validate
 	return modelfunctions.setfiledetails(self, filedetails, {configfile})
 end
+
+return mymodule