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, 5 deletions

diff --git a/openvpn-controller.lua b/openvpn-controller.lua
index 3155701..e9e6575 100644
--- a/openvpn-controller.lua
+++ b/openvpn-controller.lua
@@ -1,7 +1,5 @@
 module (..., package.seeall)
 
-require("controllerfunctions")
-
 mvc = {}
 mvc.on_load = function(self, parent)
 	self.model.set_processname(string.match(self.conf.prefix, "[^/]+"))
@@ -14,11 +12,11 @@ status = function(self)
 end
 
 startstop = function(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
 
 expert = function(self)
-	return controllerfunctions.handle_form(self, self.model.get_filecontent, self.model.update_filecontent, self.clientdata, "Save", "Edit Config File", "Config File Saved")
+	return self.handle_form(self, self.model.get_filecontent, self.model.update_filecontent, self.clientdata, "Save", "Edit Config File", "Config File Saved")
 end
 
 viewconfig = function(self)
@@ -42,7 +40,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)