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

1 files changed, 3 insertions, 9 deletions

diff --git a/openntpd-controller.lua b/openntpd-controller.lua
index f735e84..dc90eb4 100644
--- a/openntpd-controller.lua
+++ b/openntpd-controller.lua
@@ -1,15 +1,9 @@
 module (..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
--- ################################################################################
--- PUBLIC FUNCTIONS
-
 default_action = "status"
 
 function config(self)
-	return controllerfunctions.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit OpenNTPD Config", "OpenNTPD Configuration Saved")
+	return self.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit OpenNTPD Config", "OpenNTPD Configuration Saved")
 end
 
 function status (self)
@@ -21,9 +15,9 @@ function details (self)
 end
 
 function expert (self)
-	return controllerfunctions.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Config", "Configuration Set")
+	return self.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Config", "Configuration Set")
 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