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/openvpn-controller.lua b/openvpn-controller.lua
index 6c69253..0efa765 100644
--- a/openvpn-controller.lua
+++ b/openvpn-controller.lua
@@ -1,52 +1,54 @@
-module (..., package.seeall)
+local mymodule = {}
 
-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"
 
-status = function(self)
+mymodule.status = function(self)
 	return self.model.getstatus()
 end
 
-startstop = function(self)
+mymodule.startstop = function(self)
 	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
 
-expert = function(self)
+mymodule.expert = function(self)
 	return self.handle_form(self, self.model.get_filecontent, self.model.update_filecontent, self.clientdata, "Save", "Edit Config File", "Config File Saved")
 end
 
-viewconfig = function(self)
+mymodule.viewconfig = function(self)
 	return self.model.get_config()
 end
 
-statusinfo = function (self)
+mymodule.statusinfo = function (self)
 	return self.model.getclientinfo()
 end
 
-logfile = function (self)
+mymodule.logfile = function (self)
 	return self.model.get_logfile()
 end
 
-function listcerts(self)
+function mymodule.listcerts(self)
 	return self.model.list_certs()
 end
 
-function deletecert(self)
+function mymodule.deletecert(self)
 	return self.handle_form(self, self.model.get_delete_cert, self.model.delete_cert, self.clientdata, "Delete", "Delete Certificate", "Certificate Deleted")
 end
 
-function uploadcert (self)
+function mymodule.uploadcert (self)
 	return self.handle_form(self, self.model.new_upload_cert, self.model.upload_cert, self.clientdata, "Upload", "Upload Certificate", "Certificate Uploaded")
 end
 
-function viewcert(self)
+function mymodule.viewcert(self)
 	return self.model.view_cert(self.clientdata.cert)
 end
 
-function generatedhparams(self)
+function mymodule.generatedhparams(self)
 	return self.handle_form(self, self.model.get_generate_dh_params, self.model.generate_dh_params, self.clientdata, "Generate", "Generate Diffie Hellman parameters", "Diffie Hellman parameters generated")
 end
+
+return mymodule