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, 15 insertions, 13 deletions

diff --git a/tcpproxy-controller.lua b/tcpproxy-controller.lua
index 3809a10..198da9d 100644
--- a/tcpproxy-controller.lua
+++ b/tcpproxy-controller.lua
@@ -1,47 +1,49 @@
-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 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", "Configuration Saved")
 end
 
-function smtpstatus(self)
+function mymodule.smtpstatus(self)
 	return self.model.getsmtpstatus()
 end
 
-function listsmtpentries(self)
+function mymodule.listsmtpentries(self)
 	return self.model.listsmtpentries(self)
 end
 
-function editsmtpentry(self)
+function mymodule.editsmtpentry(self)
 	return self.handle_form(self, function() return self.model.readsmtpentry(self.clientdata.ipaddr) end, self.model.updatesmtpentry, self.clientdata, "Save", "Edit SMTP Proxy Entry", "SMTP Proxy Entry Saved" )
 end
 
-function delsmtpentry(self)
+function mymodule.delsmtpentry(self)
 	return self.handle_form(self, self.model.getdelsmtpentry, self.model.delsmtpentry, self.clientdata, "Delete", "Delete SMTP Proxy Entry", "SMTP Proxy Entry Deleted" )
 end
 
-function listsmtpfiles(self)
+function mymodule.listsmtpfiles(self)
 	return self.model.listsmtpfiles(self)
 end
 
-function createsmtpfile(self)
+function mymodule.createsmtpfile(self)
 	return self.handle_form(self, self.model.getnewsmtpfile, self.model.createsmtpfile, self.clientdata, "Create", "Create New SMTP Proxy File", "SMTP Proxy File Created")
 end
 
-function editsmtpfile(self)
+function mymodule.editsmtpfile(self)
 	return self.handle_form(self, function() return self.model.readsmtpfile(self.clientdata.filename) end, self.model.updatesmtpfile, self.clientdata, "Save", "Edit SMTP Proxy File", "SMTP Proxy File Saved" )
 end
 
-function delsmtpfile(self)
+function mymodule.delsmtpfile(self)
 	return self.handle_form(self, self.model.getdelsmtpfile, self.model.delsmtpfile, self.clientdata, "Delete", "Delete SMTP Proxy File", "SMTP Proxy File Deleted" )
 end
+
+return mymodule