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, 28 insertions, 26 deletions

diff --git a/vmail-controller.lua b/vmail-controller.lua
index c4bcc95..f706802 100644
--- a/vmail-controller.lua
+++ b/vmail-controller.lua
@@ -1,44 +1,44 @@
-module (..., package.seeall)
+local mymodule = {}
 
-default_action = "listmessages"
+mymodule.default_action = "listmessages"
 
-listfolders = function( self )
+mymodule.listfolders = function( self )
 	return self.model.list_folders()
 end
 
-listusers = function( self )
+mymodule.listusers = function( self )
 	return self.model.list_users()
 end
 
-editusers = function( self )
+mymodule.editusers = function( self )
 	return self.model.list_users()
 end
 
-deleteuser = function( self )
+mymodule.deleteuser = function( self )
 	return self.handle_form(self, self.model.get_delete_user, self.model.set_delete_user, self.clientdata, "Delete", "Delete User", "User Deleted")
 end
 
-listmessages = function( self )
+mymodule.listmessages = function( self )
 	return self.model.list_messages(self.clientdata.username)
 end
 
-listmymessages = function( self )
+mymodule.listmymessages = function( self )
 	return self.model.list_messages(self.sessiondata.userinfo.userid)
 end
 
-downloadmessage = function( self )
+mymodule.downloadmessage = function( self )
 	return self.model.get_message(self.clientdata.message)
 end
 
-downloadmymessage = function( self )
+mymodule.downloadmymessage = function( self )
 	return self.model.get_message(self.clientdata.message, self.sessiondata.userinfo.userid)
 end
 
-deletemessage = function( self )
+mymodule.deletemessage = function( self )
 	return self.handle_form(self, self.model.get_delete_message, self.model.set_delete_message, self.clientdata, "Delete", "Delete Message", "Message Deleted")
 end
 
-deletemymessage = function( self )
+mymodule.deletemymessage = function( self )
 	self.clientdata.username = nil
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
@@ -46,11 +46,11 @@ deletemymessage = function( self )
 	return self.handle_form(self, self.model.get_delete_message, self.model.set_delete_message, self.clientdata, "Delete", "Delete Message", "Message Deleted")
 end
 
-forwardmessage = function( self )
+mymodule.forwardmessage = function( self )
 	return self.handle_form(self, self.model.get_forward_message, self.model.forward_message, self.clientdata, "Forward", "Forward Message", "Message Forwarded")
 end
 
-forwardmymessage = function( self )
+mymodule.forwardmymessage = function( self )
 	self.clientdata.username = nil
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
@@ -58,11 +58,11 @@ forwardmymessage = function( self )
 	return self.handle_form(self, self.model.get_forward_message, self.model.forward_message, self.clientdata, "Forward", "Forward Message", "Message Forwarded")
 end
 
-emailmessage = function( self )
+mymodule.emailmessage = function( self )
 	return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message")
 end
 
-emailmymessage = function( self )
+mymodule.emailmymessage = function( self )
 	self.clientdata.username = nil
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
@@ -70,11 +70,11 @@ emailmymessage = function( self )
 	return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message")
 end
 
-movemessage = function( self )
+mymodule.movemessage = function( self )
 	return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata, "Move")
 end
 
-movemymessage = function( self )
+mymodule.movemymessage = function( self )
 	self.clientdata.username = nil
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
@@ -82,11 +82,11 @@ movemymessage = function( self )
 	return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata, "Move")
 end
 
-callbackmessage = function( self )
+mymodule.callbackmessage = function( self )
 	return self.handle_form(self, self.model.get_callback_message, self.model.callback_message, self.clientdata, "Callme")
 end
 
-callbackmymessage = function( self )
+mymodule.callbackmymessage = function( self )
 	self.clientdata.username = nil
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
@@ -94,11 +94,11 @@ callbackmymessage = function( self )
 	return self.handle_form(self, self.model.get_callback_message, self.model.callback_message, self.clientdata, "Callme")
 end
 
-editusersettings = function( self )
+mymodule.editusersettings = function( self )
 	return self.handle_form(self, self.model.get_usersettings, self.model.update_usersettings, self.clientdata, "Save", "Edit Settings", "Settings Saved")
 end
 
-editmyusersettings = function( self )
+mymodule.editmyusersettings = function( self )
 	self.clientdata.username = nil
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
@@ -106,20 +106,22 @@ editmyusersettings = function( self )
 	return self.handle_form(self, self.model.get_usersettings, self.model.update_usersettings, self.clientdata, "Save", "Edit Settings", "Settings Saved")
 end
 
-createuser = function( self )
+mymodule.createuser = function( self )
 	return self.handle_form(self, self.model.get_usersettings, self.model.create_usersettings, self.clientdata, "Create", "Create User", "User Created")
 end
 
-processdialplanxml = function( self )
+mymodule.processdialplanxml = function( self )
 	self.conf.viewtype = "xml"
 	return self.model.process_dialplan_xml_request(self.clientdata)
 end
 
-processdirectoryxml = function( self )
+mymodule.processdirectoryxml = function( self )
 	self.conf.viewtype = "xml"
 	return self.model.process_directory_xml_request(self.clientdata)
 end
 
-editconfig = function( self )
+mymodule.editconfig = function( self )
 	return self.handle_form(self, self.model.get_config, self.model.update_config, self.clientdata, "Save", "Update Config", "Config Saved")
 end
+
+return mymodule