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, 6 insertions, 9 deletions

diff --git a/dnscache-controller.lua b/dnscache-controller.lua
index f14d4aa..978b3b3 100644
--- a/dnscache-controller.lua
+++ b/dnscache-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 default_action = "status"
 
 function status(self)
@@ -10,19 +7,19 @@ 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 config(self)
-	return controllerfunctions.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Config", "Configuration Set")
+	return self.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Config", "Configuration Set")
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config File", "Configuration File Set")
+	return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config File", "Configuration File Set")
 end
 
 function editips(self)
-	return controllerfunctions.handle_form(self, self.model.getIPs, self.model.setIPs, self.clientdata, "Save", "Edit IP List", "IP List Set")
+	return self.handle_form(self, self.model.getIPs, self.model.setIPs, self.clientdata, "Save", "Edit IP List", "IP List Set")
 end
 
 function listdomains(self)
@@ -30,11 +27,11 @@ function listdomains(self)
 end
 
 function createdomain(self)
-	return controllerfunctions.handle_form(self, self.model.getNewDomain, self.model.setNewDomain, self.clientdata, "Create", "Create New Domain", "New Domain Created")
+	return self.handle_form(self, self.model.getNewDomain, self.model.setNewDomain, self.clientdata, "Create", "Create New Domain", "New Domain Created")
 end
 
 function editdomain(self)
-	return controllerfunctions.handle_form(self, function(form) return self.model.getDomain(self.clientdata.domain) end,
+	return self.handle_form(self, function(form) return self.model.getDomain(self.clientdata.domain) end,
 		self.model.setDomain, self.clientdata, "Save", "Edit Domain Entry", "Domain Saved")
 end