diff options
author | Ted Trask <ttrask01@yahoo.com> | 2012-04-18 01:58:05 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2012-04-18 01:58:05 +0000 |
commit | a041164aca00a7a365674361390a26ffa00d8242 (patch) | |
tree | 481f2ee446ca6671c60012d865d1ece6d7941e59 /squid-controller.lua | |
parent | cbd7207fdf7f206aa9574e2169fe79891805777d (diff) | |
download | acf-squid-a041164aca00a7a365674361390a26ffa00d8242.tar.bz2 acf-squid-a041164aca00a7a365674361390a26ffa00d8242.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 'squid-controller.lua')
-rw-r--r-- | squid-controller.lua | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/squid-controller.lua b/squid-controller.lua index e99345f..3174f61 100644 --- a/squid-controller.lua +++ b/squid-controller.lua @@ -2,8 +2,6 @@ module (..., package.seeall) -require("controllerfunctions") - default_action = "status" status = function( self ) @@ -11,15 +9,15 @@ 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 config = function( self ) - return controllerfunctions.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Set") + return self.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Set") end digest = function( self ) - return controllerfunctions.handle_form(self, self.model.read_digest_userlist, self.model.update_digest_userlist, self.clientdata, "Save", "Edit User List", "User List Set") + return self.handle_form(self, self.model.read_digest_userlist, self.model.update_digest_userlist, self.clientdata, "Save", "Edit User List", "User List Set") end enabledigestlist = function( self ) @@ -27,7 +25,7 @@ enabledigestlist = function( self ) end expert = function( self ) - return controllerfunctions.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Config", "Configuration Set") + return self.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Config", "Configuration Set") end --[[ saccess = function( self ) @@ -54,7 +52,7 @@ listacls = function( self ) end editacl = function( self ) - return controllerfunctions.handle_form(self, function() return self.model.read_acl(self.clientdata.linenum) end, self.model.update_acl, self.clientdata, "Save", "Edit ACL", "ACL Saved") + return self.handle_form(self, function() return self.model.read_acl(self.clientdata.linenum) end, self.model.update_acl, self.clientdata, "Save", "Edit ACL", "ACL Saved") end deleteacl = function( self ) @@ -67,11 +65,11 @@ function listfiles(self) end function createfile(self) - return controllerfunctions.handle_form(self, self.model.getnewfile, self.model.createfile, self.clientdata, "Create", "Create New Squid File", "Squid File Created") + return self.handle_form(self, self.model.getnewfile, self.model.createfile, self.clientdata, "Create", "Create New Squid File", "Squid File Created") end function editfile(self) - return controllerfunctions.handle_form(self, function() return self.model.readfile(self.clientdata.filename) end, self.model.updatefile, self.clientdata, "Save", "Edit Squid File", "Squid File Saved" ) + return self.handle_form(self, function() return self.model.readfile(self.clientdata.filename) end, self.model.updatefile, self.clientdata, "Save", "Edit Squid File", "Squid File Saved" ) end function deletefile(self) |