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, 5 insertions, 8 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