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, 26 insertions, 24 deletions

diff --git a/tinydns-controller.lua b/tinydns-controller.lua
index cd623b3..9af5d36 100644
--- a/tinydns-controller.lua
+++ b/tinydns-controller.lua
@@ -1,55 +1,55 @@
-module(..., package.seeall)
+local mymodule = {}
 validator = require("acf.validator")
 
-mvc = {}
-mvc.on_load = function(self, parent)
+mymodule.mvc = {}
+mymodule.mvc.on_load = function(self, parent)
 	self.model.set_processname(string.match(self.conf.prefix, "[^/]+"))
 end
 
-default_action = "status"
+mymodule.default_action = "status"
 
-function status(self)
+function mymodule.status(self)
 	return self.model.getstatus()
 end
 
-function view(self)
-	return self.model.getconfigobjects(self, self.clientdata.filename, sessiondata.userinfo.userid)
+function mymodule.view(self)
+	return self.model.getconfigobjects(self, self.clientdata.filename, self.sessiondata.userinfo.userid)
 end
 
-function startstop(self)
+function mymodule.startstop(self)
 	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
 
-function config(self)
+function mymodule.config(self)
 	return self.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
 end
 
-function newfile(self)
+function mymodule.newfile(self)
 	return self.handle_form(self, self.model.getnewconfigfile, function(self, value)
-			return self.model.createconfigfile(self, value, sessiondata.userinfo.userid)
+			return self.model.createconfigfile(self, value, self.sessiondata.userinfo.userid)
 		end, self.clientdata, "Create", "Create New Config File", "Config File Created")
 end
 
-function listfiles(self)
-	local configfiles = self.model.getfilelist(self, sessiondata.userinfo.userid)
+function mymodule.listfiles(self)
+	local configfiles = self.model.getfilelist(self, self.sessiondata.userinfo.userid)
 	local config = {}
 	for k,v in pairs(configfiles.value) do
-		local filedetails = self.model.get_filedetails(self, v, sessiondata.userinfo.userid)
+		local filedetails = self.model.get_filedetails(self, v, self.sessiondata.userinfo.userid)
 		table.insert(config,filedetails)
 	end
 
 	return cfe({ type="list", value=config, label="Config files" })
 end
 
-function edit(self)
-	return editfile(self)
+function mymodule.edit(self)
+	return mymodule.editfile(self)
 end
 
-function editfile(self)
+function mymodule.editfile(self)
 	config = self.handle_form(self, function()
-			return self.model.get_filedetails(self, self.clientdata.filename, sessiondata.userinfo.userid)
+			return self.model.get_filedetails(self, self.clientdata.filename, self.sessiondata.userinfo.userid)
 		end, function(self, value)
-			return self.model.set_filedetails(self, value, sessiondata.userinfo.userid)
+			return self.model.set_filedetails(self, value, self.sessiondata.userinfo.userid)
 		end, self.clientdata, "Save", "Edit Config File", "Config File Saved")
 	
 	if self.clientdata.linenumber and validator.is_integer(self.clientdata.linenumber) then
@@ -58,22 +58,24 @@ function editfile(self)
 	return config
 end
 
-function delete(self)
-	return self.handle_form(self, self.model.get_remove_file, function(self, value) return self.model.remove_file(self, value, sessiondata.userinfo.userid) end, self.clientdata, "Delete", "Delete Config File", "Config File deleted")
+function mymodule.delete(self)
+	return self.handle_form(self, self.model.get_remove_file, function(self, value) return self.model.remove_file(self, value, self.sessiondata.userinfo.userid) end, self.clientdata, "Delete", "Delete Config File", "Config File deleted")
 end
 
-function listpermissions(self)
+function mymodule.listpermissions(self)
 	return self.model:getpermissionslist()
 end
 
-function edituserpermissions(self)
+function mymodule.edituserpermissions(self)
 	return self.handle_form(self, function()
 			return self.model:getuserpermissions(self.clientdata.userid)
 		end, self.model.setuserpermissions, self.clientdata, "Save", "Edit User Permissions", "User permissions set")
 end
 
-function editrolepermissions(self)
+function mymodule.editrolepermissions(self)
 	return self.handle_form(self, function()
 			return self.model:getrolepermissions(self.clientdata.role)
 		end, self.model.setrolepermissions, self.clientdata, "Save", "Edit Role Permissions", "Role permissions set")
 end
+
+return mymodule