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

diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua
index ae4a2a2..6070dcc 100644
--- a/rrdtool-controller.lua
+++ b/rrdtool-controller.lua
@@ -1,52 +1,52 @@
-module(..., package.seeall)
+local mymodule = {}
 
-default_action = "status"
+mymodule.default_action = "status"
 
-function status(self)
+function mymodule.status(self)
 	return self.model.getstatus()
 end
 
-function expert(self)
+function mymodule.expert(self)
 	return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Saved")
 end
 
-function listrrd(self)
+function mymodule.listrrd(self)
 	local configfiles = self.model.getrrdlist()
 	return cfe({ type="list", value=configfiles.value, label="View/Edit RoundRobinDatabase (rrd) files" })
 end
 
-function createrrd(self)
+function mymodule.createrrd(self)
 	return self.handle_form(self, self.model.createnewrrd, function(self, value)
-			return self.model.savenewrrd(self, value, sessiondata.userinfo.userid)
+			return self.model.savenewrrd(self, value, self.sessiondata.userinfo.userid)
 		end, self.clientdata, "Save", "Create new RRD", "File saved")
 end
 
-function delete(self)
-	return self:redirect_to_referrer(self.model.remove_file(self, self.clientdata.filename, sessiondata.userinfo.userid))
+function mymodule.delete(self)
+	return self:redirect_to_referrer(self.model.remove_file(self, self.clientdata.filename, self.sessiondata.userinfo.userid))
 end
 
-function rrdinfo(self)
-	return self:redirect_to_referrer(self.model.rrd_info(self, self.clientdata.filename, sessiondata.userinfo.userid))
+function mymodule.rrdinfo(self)
+	return self:redirect_to_referrer(self.model.rrd_info(self, self.clientdata.filename, self.sessiondata.userinfo.userid))
 end
 
-function listgraphs(self)
+function mymodule.listgraphs(self)
 	return self.model.list_graphs()
 end
 
-function viewgraph(self)
+function mymodule.viewgraph(self)
 	return self.model.view_graph(self, self.clientdata.group, self.clientdata.id)
 end
 
-function listgraphcfg(self)
+function mymodule.listgraphcfg(self)
 	local configfiles = self.model.getgraphlist()
 	return cfe({ type="list", value=configfiles.value, label="View/Edit graph files" })
 end
 
-function editgraphcfg(self)
+function mymodule.editgraphcfg(self)
 	config = self.handle_form(self, 
 	  function() return self.model.getgraphfile(self.clientdata.filename) 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
@@ -55,4 +55,6 @@ function editgraphcfg(self)
 	return config
 end
 
-newgraphcfg = editgraphcfg
+mymodule.newgraphcfg = mymodule.editgraphcfg
+
+return mymodule