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/iptables-controller.lua b/iptables-controller.lua
index 95b2bd6..0ac2ba2 100644
--- a/iptables-controller.lua
+++ b/iptables-controller.lua
@@ -1,55 +1,57 @@
-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 details(self)
+function mymodule.details(self)
 	return self.model.getstatusdetails()
 end
 
-function filterrules(self)
+function mymodule.filterrules(self)
 	return self.model.getrules("filter")
 end
 
-function natrules(self)
+function mymodule.natrules(self)
 	return self.model.getrules("nat")
 end
 
-function manglerules(self)
+function mymodule.manglerules(self)
 	return self.model.getrules("mangle")
 end
 
-function editchain(self)
+function mymodule.editchain(self)
 	return self.handle_form(self, function() return self.model.read_chain(self.clientdata.table, self.clientdata.chain or "") end, self.model.update_chain, self.clientdata, "Save", "Edit Chain", "Chain saved")
 end
 
-function createchain(self)
+function mymodule.createchain(self)
 	return self.handle_form(self, function() return self.model.read_chain(self.clientdata.table) end, self.model.create_chain, self.clientdata, "Create", "Create New Chain", "Chain created")
 end
 
-function deletechain(self)
+function mymodule.deletechain(self)
 	return self.handle_form(self, self.model.get_delete_chain, self.model.delete_chain, self.clientdata, "Delete", "Delete Chain", "Chain deleted")
 end
 
-function editrule(self)
+function mymodule.editrule(self)
 	return self.handle_form(self, function() return self.model.read_rule(self.clientdata.table, self.clientdata.chain or "", self.clientdata.position or "") end, self.model.update_rule, self.clientdata, "Save", "Edit Rule", "Rule saved")
 end
 
-function createrule(self)
+function mymodule.createrule(self)
 	return self.handle_form(self, function() return self.model.read_rule(self.clientdata.table, self.clientdata.chain, self.clientdata.position) end, self.model.create_rule, self.clientdata, "Create", "Create New Rule", "Rule created")
 end
 
-function deleterule(self)
+function mymodule.deleterule(self)
 	return self.handle_form(self, self.model.get_delete_rule, self.model.delete_rule, self.clientdata, "Delete", "Delete Rule", "Rule deleted")
 end
 
-function expert(self)
+function mymodule.expert(self)
 	return self.handle_form(self, self.model.readrulesfile, self.model.updaterulesfile, self.clientdata, "Save", "Edit Rules File", "Rules File Saved")
 end
 
-function startstop(self)
+function mymodule.startstop(self)
 	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
+
+return mymodule