From e6a179c95704f7013b2024bb3491f1344ee695d4 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 18 Apr 2012 01:13:55 +0000
Subject: 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
---
 fetchcrl-controller.lua | 6 ++----
 fetchcrl-model.lua      | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fetchcrl-controller.lua b/fetchcrl-controller.lua
index d5d3e0d..c2b91eb 100644
--- a/fetchcrl-controller.lua
+++ b/fetchcrl-controller.lua
@@ -2,8 +2,6 @@
 
 module (..., package.seeall)
 
-require("controllerfunctions")
-
 default_action = "status"
 
 status = function( self )
@@ -11,9 +9,9 @@ status = function( self )
 end
 
 startstop = function( 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
 
 expert = function( self )
-	return controllerfunctions.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
+	return self.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
 end
diff --git a/fetchcrl-model.lua b/fetchcrl-model.lua
index 3d3a5fe..5cd3d62 100644
--- a/fetchcrl-model.lua
+++ b/fetchcrl-model.lua
@@ -2,9 +2,9 @@ module (..., package.seeall)
 
 -- Load libraries
 require("modelfunctions")
-require("processinfo")
-require("fs")
-require("format")
+processinfo = require("acf.processinfo")
+fs = require("acf.fs")
+format = require("acf.format")
 
 -- Set variables
 local packagename = "fetch-crl"
-- 
cgit v1.2.3