Started work on updating for acf-core-0.15

Removed controllerfunctions library (still needs more work and corresponding work in model)
Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries

1 files changed, 5 insertions, 7 deletions

diff --git a/openssl-controller.lua b/openssl-controller.lua
index e7daabd..a9ac987 100755
--- a/openssl-controller.lua
+++ b/openssl-controller.lua
@@ -1,8 +1,6 @@
 -- the openssl certificates controller
 module (..., package.seeall)
 
-require("controllerfunctions")
-
 default_action = "status"
 
 local sslstatus
@@ -46,12 +44,12 @@ end
 
 -- Form to request a new cert
 request = function(self)
-	return controllerfunctions.handle_form(self, self.model.getnewrequest, function(value) return self.model.submitrequest(value, self.sessiondata.userinfo.userid) end, self.clientdata, "Submit", "Request Certificate", "Request Submitted")
+	return self.handle_form(self, self.model.getnewrequest, function(value) return self.model.submitrequest(value, self.sessiondata.userinfo.userid) end, self.clientdata, "Submit", "Request Certificate", "Request Submitted")
 end
 
 -- Form to edit request defaults
 editdefaults = function(self)
-	return controllerfunctions.handle_form(self, self.model.getreqdefaults, self.model.setreqdefaults, self.clientdata, "Save", "Edit Certificate Defaults", "Defaults Set")
+	return self.handle_form(self, self.model.getreqdefaults, self.model.setreqdefaults, self.clientdata, "Save", "Edit Certificate Defaults", "Defaults Set")
 end
 
 -- View request details
@@ -113,7 +111,7 @@ end
 
 -- Put the CA cert
 putcacert = function(self)
-	return controllerfunctions.handle_form(self, self.model.getnewputca, self.model.putca, self.clientdata, "Upload", "Upload CA Certificate", "Certificate Uploaded")
+	return self.handle_form(self, self.model.getnewputca, self.model.putca, self.clientdata, "Upload", "Upload CA Certificate", "Certificate Uploaded")
 end
 
 downloadcacert = function(self)
@@ -123,11 +121,11 @@ end
 		
 -- Generate a self-signed CA
 generatecacert = function(self)
-	return controllerfunctions.handle_form(self, self.model.getnewcarequest, self.model.generateca, self.clientdata, "Generate", "Generate CA Certificate", "Certificate Generated")
+	return self.handle_form(self, self.model.getnewcarequest, self.model.generateca, self.clientdata, "Generate", "Generate CA Certificate", "Certificate Generated")
 end
 
 editconfigfile = function(self)
-	return controllerfunctions.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config File", "Config File Saved")
+	return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config File", "Config File Saved")
 end
 
 checkenvironment = function(self)