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, 10 insertions, 8 deletions

diff --git a/vlc-controller.lua b/vlc-controller.lua
index 12f0fe6..ddfef2d 100644
--- a/vlc-controller.lua
+++ b/vlc-controller.lua
@@ -1,25 +1,27 @@
-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"
 
-function status(self)
+function mymodule.status(self)
 	return self.model.getstatus()
 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 expert(self)
+function mymodule.expert(self)
 	return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config File", "Configuration File Set")
 end
 
-function logfile(self)
+function mymodule.logfile(self)
 	return self.model.get_filedetails(self.clientdata.name or "", self.clientdata.grep)
 
 end
+
+return mymodule