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

7 files changed, 22 insertions, 22 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)
diff --git a/openvpn-listcerts-html.lsp b/openvpn-listcerts-html.lsp
index 22252fa..7e4a0ab 100644
--- a/openvpn-listcerts-html.lsp
+++ b/openvpn-listcerts-html.lsp
@@ -1,8 +1,8 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"deletecert", "generatedhparams"}, session) %>
-<% displaycommandresults({"uploadcert"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deletecert", "generatedhparams"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"uploadcert"}, session, true) %>
 
 <H1><%= html.html_escape(view.label) %></H1>
 
diff --git a/openvpn-logfile-html.lsp b/openvpn-logfile-html.lsp
index 7271147..a0bd319 100644
--- a/openvpn-logfile-html.lsp
+++ b/openvpn-logfile-html.lsp
@@ -1,5 +1,4 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
diff --git a/openvpn-model.lua b/openvpn-model.lua
index 59be82c..f439fef 100644
--- a/openvpn-model.lua
+++ b/openvpn-model.lua
@@ -1,12 +1,12 @@
 module (..., package.seeall)
 
-require ("modelfunctions")
-require ("posix")
-require ("format")
-require ("fs")
-require ("processinfo")
-require ("validator")
-require ("date")
+require("modelfunctions")
+require("posix")
+format = require("acf.format")
+fs = require("acf.fs")
+processinfo = require("acf.processinfo")
+validator = require("acf.validator")
+date = require("acf.date")
 
 local processname = "openvpn"
 local packagename = "openvpn"
@@ -163,8 +163,12 @@ function getstatus()
 	return modelfunctions.getstatus(processname, packagename, "OpenVPN Status")
 end
 
-function startstop_service(action)
-	return modelfunctions.startstop_service(processname, action)
+function get_startstop(clientdata)       
+        return modelfunctions.get_startstop(processname)
+end
+
+function startstop_service(startstop, action)        
+        return modelfunctions.startstop_service(startstop, action)
 end
 
 function getclientinfo()
diff --git a/openvpn-startstop-html.lsp b/openvpn-startstop-html.lsp
deleted file mode 120000
index 0ea2627..0000000
--- a/openvpn-startstop-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-../startstop-html.lsp
\ No newline at end of file
diff --git a/openvpn-uploadcert-html.lsp b/openvpn-uploadcert-html.lsp
index fc1b408..4e524e6 100644
--- a/openvpn-uploadcert-html.lsp
+++ b/openvpn-uploadcert-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
@@ -8,5 +8,5 @@
 	form.value.cert.type="file"
 	form.value.password.type="password"
 	local order = {"cert", "password"}
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/openvpn-viewconfig-html.lsp b/openvpn-viewconfig-html.lsp
index 3152f1d..35118f9 100644
--- a/openvpn-viewconfig-html.lsp
+++ b/openvpn-viewconfig-html.lsp
@@ -1,5 +1,5 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("format") %>
+<% format = require("acf.format") %>
 <% local shortname = string.gsub(view.value.name, "^.*/", "") %>
 
 <h1><%= html.html_escape(format.cap_begin_word(view.value.type)) %> Config</h1>