From 72dedfca943bb7a74598415d4f5d40cd555b0dec Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 18 Apr 2012 01:21:25 +0000 Subject: Started work on updating for acf-core-0.15 Removed controllerfunctions library (still needs more work and corresponding work in model) Updated startstop functionality and deleted view Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries --- ipsectools-controller.lua | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'ipsectools-controller.lua') diff --git a/ipsectools-controller.lua b/ipsectools-controller.lua index 545b675..f6d7e4f 100644 --- a/ipsectools-controller.lua +++ b/ipsectools-controller.lua @@ -1,14 +1,5 @@ module(..., package.seeall) --- Load libraries -require("controllerfunctions") - --- ################################################################################ --- LOCAL FUNCTIONS - --- ################################################################################ --- PUBLIC FUNCTIONS - default_action = "status" function status(self) @@ -16,7 +7,7 @@ function status(self) end function startstop(self) - return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata) + return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata) end function details(self) @@ -24,11 +15,11 @@ function details(self) end function editracoon (self) - return controllerfunctions.handle_form(self, self.model.get_racoonfiledetails, self.model.update_racoonfiledetails, self.clientdata, "Save", "Edit Racoon Config", "Configuration Set") + return self.handle_form(self, self.model.get_racoonfiledetails, self.model.update_racoonfiledetails, self.clientdata, "Save", "Edit Racoon Config", "Configuration Set") end function editipsec (self) - return controllerfunctions.handle_form(self, self.model.get_ipsecfiledetails, self.model.update_ipsecfiledetails, self.clientdata, "Save", "Edit IPSec Config", "Configuration Set") + return self.handle_form(self, self.model.get_ipsecfiledetails, self.model.update_ipsecfiledetails, self.clientdata, "Save", "Edit IPSec Config", "Configuration Set") end function listcerts(self) @@ -40,7 +31,7 @@ function deletecert(self) end function uploadcert (self) - return controllerfunctions.handle_form(self, self.model.new_upload_cert, self.model.upload_cert, self.clientdata, "Upload", "Upload Certificate", "Certificate Uploaded") + return self.handle_form(self, self.model.new_upload_cert, self.model.upload_cert, self.clientdata, "Upload", "Upload Certificate", "Certificate Uploaded") end function viewcert(self) -- cgit v1.2.3