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, 8 insertions, 4 deletions

diff --git a/shorewall-model.lua b/shorewall-model.lua
index 3669fc0..5aef6f8 100644
--- a/shorewall-model.lua
+++ b/shorewall-model.lua
@@ -2,8 +2,8 @@ module(..., package.seeall)
 
 -- Load libraries
 require("modelfunctions")
-require("fs")
-require("format")
+fs = require("acf.fs")
+format = require("acf.format")
 
 -- Set variables
 local configfile = "/etc/shorewall/shorewall.conf"
@@ -181,8 +181,12 @@ function getstatusdetails()
 	return cfe({ value=programstate, label="Shorewall status report" })
 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 configcheck ()