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, 23 insertions, 23 deletions

diff --git a/samba-controller.lua b/samba-controller.lua
index e3f1a4f..7d7490a 100644
--- a/samba-controller.lua
+++ b/samba-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 default_action = "status"
 
 function status(self)
@@ -10,7 +7,7 @@ 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 listfiles(self)
@@ -18,11 +15,11 @@ function listfiles(self)
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, function() return self.model.getconfigfile(self.clientdata.filename) end, self.model.setconfigfile, self.clientdata, "Save", "Edit Samba File", "File Saved")
+	return self.handle_form(self, function() return self.model.getconfigfile(self.clientdata.filename) end, self.model.setconfigfile, self.clientdata, "Save", "Edit Samba File", "File Saved")
 end
 
 function join(self)
-	return controllerfunctions.handle_form(self, self.model.get_join, self.model.set_join, self.clientdata, "Join", "Join Domain")
+	return self.handle_form(self, self.model.get_join, self.model.set_join, self.clientdata, "Join", "Join Domain")
 end
 
 function listshares(self)
@@ -30,7 +27,7 @@ function listshares(self)
 end
 
 function editshare(self)
-	return controllerfunctions.handle_form(self, function() return self.model.read_share(self.clientdata.name) end, self.model.update_share, self.clientdata, "Save", "Edit Share", "Share Saved")
+	return self.handle_form(self, function() return self.model.read_share(self.clientdata.name) end, self.model.update_share, self.clientdata, "Save", "Edit Share", "Share Saved")
 end
 
 function deleteshare(self)
@@ -38,5 +35,5 @@ function deleteshare(self)
 end
 
 function createshare(self)
-	return controllerfunctions.handle_form(self, self.model.read_share, self.model.create_share, self.clientdata, "Create", "Create Share", "Share Created")
+	return self.handle_form(self, self.model.read_share, self.model.create_share, self.clientdata, "Create", "Create Share", "Share Created")
 end
diff --git a/samba-editshare-html.lsp b/samba-editshare-html.lsp
index e1d327a..85a2cdf 100644
--- a/samba-editshare-html.lsp
+++ b/samba-editshare-html.lsp
@@ -1,10 +1,10 @@
 <% 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 = {"name", "valid", "comment", "path", "browseable", "guest", "printable", "writable"}
-	displayform(form, order, {"other"})
+	htmlviewfunctions.displayform(form, order, {"other"})
 %>
diff --git a/samba-join-html.lsp b/samba-join-html.lsp
index 2c85db6..4a340a8 100644
--- a/samba-join-html.lsp
+++ b/samba-join-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
@@ -11,5 +11,5 @@ end %>
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 	form.value.password.type = "password"
 	local order = {"domain", "login", "password"}
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/samba-listfiles-html.lsp b/samba-listfiles-html.lsp
index 42887ac..588c753 100644
--- a/samba-listfiles-html.lsp
+++ b/samba-listfiles-html.lsp
@@ -1,8 +1,8 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"expert"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"expert"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/samba-listshares-html.lsp b/samba-listshares-html.lsp
index 1091c94..e118a70 100644
--- a/samba-listshares-html.lsp
+++ b/samba-listshares-html.lsp
@@ -1,9 +1,9 @@
 <% local view, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"editshare", "deleteshare"}, session) %>
-<% displaycommandresults({"createshare"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"editshare", "deleteshare"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createshare"}, session, true) %>
 
 <H1>Shares</H1>
 <DL>
diff --git a/samba-model.lua b/samba-model.lua
index 59dabb9..fd3d918 100644
--- a/samba-model.lua
+++ b/samba-model.lua
@@ -2,10 +2,10 @@ module(..., package.seeall)
 
 -- Load libraries
 require("modelfunctions")
-require("validator")
-require("fs")
+validator = require("acf.validator")
+fs = require("acf.fs")
 require("posix")
-require("format")
+format = require("acf.format")
 
 -- Set variables
 local configfile = "/etc/samba/smb.conf"
@@ -102,8 +102,12 @@ end
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-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 getstatus()
diff --git a/samba-startstop-html.lsp b/samba-startstop-html.lsp
deleted file mode 120000
index 0ea2627..0000000
--- a/samba-startstop-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-../startstop-html.lsp
\ No newline at end of file