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, 18 insertions, 16 deletions

diff --git a/squid-controller.lua b/squid-controller.lua
index 3f7f5f6..774ac2f 100644
--- a/squid-controller.lua
+++ b/squid-controller.lua
@@ -1,34 +1,34 @@
 -- the squid  controller
 
-module (..., package.seeall)
+local mymodule = {}
 
-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
 
-config = function( self )
+mymodule.config = function( self )
 	return self.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Set")
 end
 
-digest = function( self )
+mymodule.digest = function( self )
 	return self.handle_form(self, self.model.read_digest_userlist, self.model.update_digest_userlist, self.clientdata, "Save", "Edit User List", "User List Set")
 end
 
-enabledigestlist = function( self )
+mymodule.enabledigestlist = function( self )
 	return self.handle_form(self, self.model.get_enable_digest_userlist, self.model.enable_digest_userlist, self.clientdata, "Enable", "Enable Digest User List", "Digest User List enabled")
 end
 
-expert = function( self )
+mymodule.expert = function( self )
 	return self.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Config", "Configuration Set")
 end
 --[[
-saccess = function( self )
+mymodule.saccess = function( self )
 
 	local service = { message="", status="", config="" }
 	
@@ -47,31 +47,33 @@ saccess = function( self )
 	return ( cfe ({ service = service }) )
 end
 
-listacls = function( self )
+mymodule.listacls = function( self )
 	return self.model.read_acls()
 end
 
-editacl = function( self )
+mymodule.editacl = function( self )
 	return self.handle_form(self, function() return self.model.read_acl(self.clientdata.linenum) end, self.model.update_acl, self.clientdata, "Save", "Edit ACL", "ACL Saved")
 end
 
-deleteacl = function( self )
+mymodule.deleteacl = function( self )
 	return self:redirect_to_referrer(self.model.delete_acl(self.clientdata.linenum))
 end
 --]]
 
-function listfiles(self)
+function mymodule.listfiles(self)
 	return self.model.listfiles(self)
 end
 
-function createfile(self)
+function mymodule.createfile(self)
 	return self.handle_form(self, self.model.getnewfile, self.model.createfile, self.clientdata, "Create", "Create New Squid File", "Squid File Created")
 end
 
-function editfile(self)
+function mymodule.editfile(self)
 	return self.handle_form(self, function() return self.model.readfile(self.clientdata.filename) end, self.model.updatefile, self.clientdata, "Save", "Edit Squid File", "Squid File Saved" )
 end
 
-function deletefile(self)
+function mymodule.deletefile(self)
 	return self.handle_form(self, self.model.getdeletefile, self.model.deletefile, self.clientdata, "Delete", "Delete Squid File", "Squid File Deleted")
 end
+
+return mymodule