From 0f5d6e086d11bd3cbecbc9d99d832368ed7ef5f4 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Fri, 18 Oct 2013 21:31:27 +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. --- dhcp-controller.lua | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'dhcp-controller.lua') diff --git a/dhcp-controller.lua b/dhcp-controller.lua index 127a7a6..a43d2cb 100644 --- a/dhcp-controller.lua +++ b/dhcp-controller.lua @@ -1,60 +1,62 @@ -- the dhcpd controller -module (..., package.seeall) +local mymodule = {} -default_action = "status" +mymodule.default_action = "status" -status = function ( self ) +mymodule.status = function ( self ) return self.model.getstatus() end -startstop = function ( self ) +mymodule.startstop = function ( self ) return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata) end -settings = function( self ) +mymodule.settings = function( self ) return self.handle_form(self, self.model.read_settings, self.model.update_settings, self.clientdata, "Save", "Update Global Settings", "Global Settings Updated") end -editsubnet = function ( self ) +mymodule.editsubnet = function ( self ) return self.handle_form(self, self.model.subnet_read, self.model.subnet_update, self.clientdata, "Save", "Edit Subnet", "Subnet Settings Updated") end -createsubnet = function ( self ) +mymodule.createsubnet = function ( self ) return self.handle_form(self, self.model.create_new_subnet, self.model.subnet_create, self.clientdata, "Create", "Create new subnet", "New subnet Created") end -delsubnet = function(self) +mymodule.delsubnet = function(self) return self.handle_form(self, self.model.get_subnet_delete, self.model.subnet_delete, self.clientdata, "Delete", "Delete subnet", "Subnet Deleted") end -listsubnets = function ( self ) +mymodule.listsubnets = function ( self ) return self.model.get_subnets() end -edithost = function ( self ) +mymodule.edithost = function ( self ) return self.handle_form(self, self.model.host_read, self.model.host_update, self.clientdata, "Save", "Edit Host", "Host Settings Updated") end -createhost = function ( self ) +mymodule.createhost = function ( self ) return self.handle_form(self, self.model.create_new_host, self.model.host_create, self.clientdata, "Create", "Create new host", "New host Created") end -delhost = function(self) +mymodule.delhost = function(self) return self.handle_form(self, self.model.get_host_delete, self.model.host_delete, self.clientdata, "Delete", "Delete host", "Host Deleted") end -listhosts = function ( self ) +mymodule.listhosts = function ( self ) return self.model.get_hosts() end -viewleases = function ( self ) +mymodule.viewleases = function ( self ) return self.model.getleases() end -listfiles = function(self) +mymodule.listfiles = function(self) return self.model.listconfigfiles() end -expert = function(self) +mymodule.expert = function(self) return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit DHCP File", "File Saved") end + +return mymodule -- cgit v1.2.3