summaryrefslogtreecommitdiffstats
path: root/dansguardian-controller.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-18 01:02:28 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-18 01:02:28 +0000
commitb0f5d4a3e85032894ec394e929ffc475d685ab0c (patch)
treebe6ba065708dd9affd7bc2177e058feb0134dfe7 /dansguardian-controller.lua
parentb621e263aee67bf6fbffddf4cbd79455f9c98a01 (diff)
downloadacf-dansguardian-b0f5d4a3e85032894ec394e929ffc475d685ab0c.tar.bz2
acf-dansguardian-b0f5d4a3e85032894ec394e929ffc475d685ab0c.tar.xz
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
Diffstat (limited to 'dansguardian-controller.lua')
-rw-r--r--dansguardian-controller.lua8
1 files changed, 3 insertions, 5 deletions
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