From b0f5d4a3e85032894ec394e929ffc475d685ab0c Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 18 Apr 2012 01:02:28 +0000 Subject: 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 --- dansguardian-controller.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'dansguardian-controller.lua') diff --git a/dansguardian-controller.lua b/dansguardian-controller.lua index 8de38b0..80dbec2 100644 --- a/dansguardian-controller.lua +++ b/dansguardian-controller.lua @@ -2,8 +2,6 @@ module (..., package.seeall) -require("controllerfunctions") - default_action = "status" status = function( self ) @@ -11,11 +9,11 @@ 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 general = function( self ) - return controllerfunctions.handle_form(self, self.model.read_general_config, self.model.update_general_config, self.clientdata, "Save", "Edit General Configuration", "General Configuration Set") + return self.handle_form(self, self.model.read_general_config, self.model.update_general_config, self.clientdata, "Save", "Edit General Configuration", "General Configuration Set") end listfiles = function( self ) @@ -27,5 +25,5 @@ listconfigfiles = function( self ) end edit = function( self ) - return controllerfunctions.handle_form(self, function() return self.model.get_file(self.clientdata.filename) end, self.model.update_file, self.clientdata, "Save", "Edit File", "File Saved") + return self.handle_form(self, function() return self.model.get_file(self.clientdata.filename) end, self.model.update_file, self.clientdata, "Save", "Edit File", "File Saved") end -- cgit v1.2.3