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

10 files changed, 33 insertions, 35 deletions

diff --git a/openssl-checkenvironment-html.lsp b/openssl-checkenvironment-html.lsp
index 0ea7a1e..1b68f14 100644
--- a/openssl-checkenvironment-html.lsp
+++ b/openssl-checkenvironment-html.lsp
@@ -1,16 +1,16 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <% if form.value.status.errtxt then
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	displayformstart(form)
+	htmlviewfunctions.displayformstart(form)
 else %>
 	<DL>
 <% end %>
-<% displayitem(form.value.status) %>
+<% htmlviewfunctions.displayitem(form.value.status) %>
 <% if form.value.status.errtxt then
-	displayformend(form)
+	htmlviewfunctions.displayformend(form)
 else %>
 	</DL>
 <% end %>
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)
diff --git a/openssl-editconfigfile-html.lsp b/openssl-editconfigfile-html.lsp
index ab13038..bff262a 100644
--- a/openssl-editconfigfile-html.lsp
+++ b/openssl-editconfigfile-html.lsp
@@ -1,7 +1,7 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"checkenvironment"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"checkenvironment"}, session, true) %>
 
 <%
 local pattern = string.gsub(page_info.prefix..page_info.controller, "[%(%)%.%%%+%-%*%?%[%]%^%$]", "%%%1")
diff --git a/openssl-editdefaults-html.lsp b/openssl-editdefaults-html.lsp
index b73b0a8..62fa950 100644
--- a/openssl-editdefaults-html.lsp
+++ b/openssl-editdefaults-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
@@ -7,6 +7,6 @@
 	local order = { "countryName", "C", "stateOrProvinceName", "ST", "localityName", "L", "organizationName", "O",
 			"organizationalUnitName", "OU", "commonName", "CN", "emailAddress" }
 	local finishingorder = { "encryption", "validdays", "certtype", "extensions" }
-	displayform(form, order, finishingorder)
+	htmlviewfunctions.displayform(form, order, finishingorder)
 %>
 
diff --git a/openssl-generatecacert-html.lsp b/openssl-generatecacert-html.lsp
index 21bc2bc..ed4eed2 100644
--- a/openssl-generatecacert-html.lsp
+++ b/openssl-generatecacert-html.lsp
@@ -1,11 +1,11 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 	local order = { "countryName", "C", "stateOrProvinceName", "ST", "localityName", "L", "organizationName", "O",
 			"organizationalUnitName", "OU", "commonName", "CN", "emailAddress" }
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
 
diff --git a/openssl-html.lsp b/openssl-html.lsp
index d6431fa..1857ce4 100644
--- a/openssl-html.lsp
+++ b/openssl-html.lsp
@@ -1,5 +1,5 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script>
@@ -11,7 +11,7 @@
 	});
 </script>
 
-<% displaycommandresults({"approve", "deleterequest", "deletemyrequest", "renewcert", "requestrenewcert", "revoke", "deletecert"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"approve", "deleterequest", "deletemyrequest", "renewcert", "requestrenewcert", "revoke", "deletecert"}, session) %>
 
 <H1>Pending certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></H1>
 <DL>
diff --git a/openssl-model.lua b/openssl-model.lua
index 44e1635..371b29b 100755
--- a/openssl-model.lua
+++ b/openssl-model.lua
@@ -2,9 +2,9 @@ module(..., package.seeall)
 
 require("posix")
 require("modelfunctions")
-require("fs")
-require("format")
-require("validator")
+fs = require("acf.fs")
+format = require("acf.format")
+validator = require("acf.validator")
 
 -- There are two options of how to allow users to specify the type of certificate they want - the request extensions
 -- and the ca signing extensions.  We have opted for making all requests look the same (same extensions) and defining
@@ -247,7 +247,7 @@ local unhashname = function(hashstring)
 end
 
 getstatus = function()
-	require("processinfo")
+	processinfo = require("acf.processinfo")
 	-- set the working directory once for model
 	posix.chdir(openssldir)
 	local value,errtxt=processinfo.package_version(packagename)
diff --git a/openssl-putcacert-html.lsp b/openssl-putcacert-html.lsp
index c4f00a7..9b4bcff 100644
--- a/openssl-putcacert-html.lsp
+++ b/openssl-putcacert-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.ca.type="file"
 	form.value.password.type="password"
 	local order = {"ca", "password"}
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/openssl-request-html.lsp b/openssl-request-html.lsp
index acbe8ed..f28b9a6 100644
--- a/openssl-request-html.lsp
+++ b/openssl-request-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
@@ -9,6 +9,6 @@
 	local order = { "countryName", "C", "stateOrProvinceName", "ST", "localityName", "L", "organizationName", "O",
 			"organizationalUnitName", "OU", "commonName", "CN", "emailAddress" }
 	local finishingorder = { "certtype", "validdays", "extensions", "password", "password_confirm" }
-	displayform(form, order, finishingorder)
+	htmlviewfunctions.displayform(form, order, finishingorder)
 %>
 
diff --git a/openssl-status-html.lsp b/openssl-status-html.lsp
index 1d3964c..cbdb729 100644
--- a/openssl-status-html.lsp
+++ b/openssl-status-html.lsp
@@ -1,13 +1,13 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"checkenvironment", "putcacert", "generatecacert"}, session, true) %>
-<% displaycommandresults({"install"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"checkenvironment", "putcacert", "generatecacert"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"install"}, session) %>
 
 <H1>System Info</H1>
 <DL>
 <%
-displayitem(view.value.version)
+htmlviewfunctions.displayitem(view.value.version)
 if view.value.version and view.value.version.errtxt and viewlibrary.check_permission("apk-tools/apk/install") then
 %>
 	<DT>Install package</DT>
@@ -15,10 +15,10 @@ if view.value.version and view.value.version.errtxt and viewlibrary.check_permis
 	<input type='hidden' name='package' value='<%= html.html_escape(view.value.version.name) %>'>
 	<input class='submit' type='submit' value='Install'></form></DD>
 <% end %>
-<% displayitem(view.value.conffile) %>
-<% displayitem(view.value.environment) %>
-<% displayitem(view.value.cacert) %>
-<% displayitem(view.value.cakey) %>
+<% htmlviewfunctions.displayitem(view.value.conffile) %>
+<% htmlviewfunctions.displayitem(view.value.environment) %>
+<% htmlviewfunctions.displayitem(view.value.cacert) %>
+<% htmlviewfunctions.displayitem(view.value.cakey) %>
 </DL>
 
 <% if not view.value.version.errtxt and not view.value.conffile.errtxt then