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, 9 insertions, 5 deletions

diff --git a/dansguardian-model.lua b/dansguardian-model.lua
index e048a0b..4180226 100644
--- a/dansguardian-model.lua
+++ b/dansguardian-model.lua
@@ -4,9 +4,9 @@ module (..., package.seeall)
 -- Load libraries
 require("modelfunctions")
 require("posix")
-require("fs")
-require("format")
-require("validator")
+fs = require("acf.fs")
+format = require("acf.format")
+validator = require("acf.validator")
 
 -- Set variables
 dansguardiancfg = "/etc/dansguardian/dansguardian.conf"
@@ -82,8 +82,12 @@ get_status = function()
 	return modelfunctions.getstatus(processname, packagename, "Dans Guardian Status")
 end
 
-startstop_service = function( 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
 
 read_general_config = function()