From 5b2a0b12e72dc9451cc605efadeb0ec67ff47499 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 21 Oct 2013 00:29:29 +0000 Subject: 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. --- samba-controller.lua | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'samba-controller.lua') diff --git a/samba-controller.lua b/samba-controller.lua index 3450ed5..f42d438 100644 --- a/samba-controller.lua +++ b/samba-controller.lua @@ -1,39 +1,41 @@ -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 listfiles(self) +function mymodule.listfiles(self) return self.model.listconfigfiles() end -function expert(self) +function mymodule.expert(self) return self.handle_form(self, function() return self.model.getconfigfile(self.clientdata.filename) end, self.model.setconfigfile, self.clientdata, "Save", "Edit Samba File", "File Saved") end -function join(self) +function mymodule.join(self) return self.handle_form(self, self.model.get_join, self.model.set_join, self.clientdata, "Join", "Join Domain") end -function listshares(self) +function mymodule.listshares(self) return self.model.list_shares() end -function editshare(self) +function mymodule.editshare(self) return self.handle_form(self, self.model.read_share, self.model.update_share, self.clientdata, "Save", "Edit Share", "Share Saved") end -function deleteshare(self) +function mymodule.deleteshare(self) return self.handle_form(self, self.model.get_delete_share, self.model.delete_share, self.clientdata, "Delete", "Delete Share", "Share Deleted") end -function createshare(self) +function mymodule.createshare(self) return self.handle_form(self, self.model.read_share, self.model.create_share, self.clientdata, "Create", "Create Share", "Share Created") end + +return mymodule -- cgit v1.2.3