Remove all calls to 'module' in preparation for move to Lua 5.2

Use mymodule parameter for module definition.
This was also helpfule in revealing places where the code relied on the global environment.

1 files changed, 12 insertions, 11 deletions

diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua
index c02d693..30cf768 100644
--- a/app/acf-util/roles-controller.lua
+++ b/app/acf-util/roles-controller.lua
@@ -1,11 +1,10 @@
 -- Roles/Group functions
-module (..., package.seeall)
+local mymodule = {}
 
-
-default_action = "read"
+mymodule.default_action = "read"
 
 -- Return your own roles/permissions
-read = function(self)
+mymodule.read = function(self)
 	userid = cfe({ value=self.sessiondata.userinfo.userid, label="User Id" })
 	roles = cfe({ type="list", value=self.sessiondata.userinfo.roles, label="Roles" })
 	permissions = cfe({ type="table", value = self.sessiondata.permissions, label="Permissions" })
@@ -13,7 +12,7 @@ read = function(self)
 end
 
 -- Return roles/permissions for specified user
-viewuserroles = function(self)
+mymodule.viewuserroles = function(self)
 	if not (self.clientdata.userid) then
 		redirect(self)
 	end
@@ -24,7 +23,7 @@ viewuserroles = function(self)
 end
 
 -- Return permissions for specified role
-viewroleperms = function(self)
+mymodule.viewroleperms = function(self)
 	if not (self.clientdata.role) then
 		redirect(self, "getlist")
 	end
@@ -34,22 +33,24 @@ viewroleperms = function(self)
 end
 
 -- Return list of all permissions
-getpermslist = function(self)
+mymodule.getpermslist = function(self)
 	return cfe({ type="group", value={permissions=self.model.get_perms_list(self)} })
 end
 
-viewroles = function(self)
+mymodule.viewroles = function(self)
 	return self.model.view_roles(self)
 end
 
-newrole = function(self)
+mymodule.newrole = function(self)
 	return self.handle_form(self, self.model.getpermissions, self.model.setnewpermissions, self.clientdata, "Create", "Create New Role", "New Role Created")
 end
 
-editrole = function(self)
+mymodule.editrole = function(self)
 	return self.handle_form(self, self.model.getpermissions, self.model.setpermissions, self.clientdata, "Save", "Edit Role", "Role Saved")
 end
 
-deleterole = function(self)
+mymodule.deleterole = function(self)
 	return self.handle_form(self, self.model.get_delete_role, self.model.delete_role, self.clientdata, "Delete", "Delete Role", "Role Deleted")
 end
+
+return mymodule