From 7ccca7213d3137b0764ef02165c44f4bd3373f45 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 12 Aug 2008 15:53:20 +0000 Subject: Modified dansguardian to use new status, startstop, and expert (replaced plain) actions. git-svn-id: svn://svn.alpinelinux.org/acf/dansguardian/trunk@1380 ab2d0c66-481e-0410-8bed-d214d4d58bed --- dansguardian-controller.lua | 152 ++++---------------------------------------- 1 file changed, 13 insertions(+), 139 deletions(-) (limited to 'dansguardian-controller.lua') diff --git a/dansguardian-controller.lua b/dansguardian-controller.lua index c88743f..97e2849 100644 --- a/dansguardian-controller.lua +++ b/dansguardian-controller.lua @@ -2,50 +2,22 @@ module (..., package.seeall) +require("controllerfunctions") + default_action = "status" status = function( self ) + return self.model.get_status() +end - local info = { - status=self.model.get_status(), - version = self.model.get_dansguardian_version(), - autostart = self.model.get_autostart(), - srvctrl = { value = srvctrl} - } - - local option = { script = self.conf.script, - prefix = self.conf.prefix, - controller = self.conf.controller, - action = self.conf.action, - extra = "" - } - - return ( cfe ({ option = option, info = info }) ) +startstop = function( self ) + return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.model.get_status, self.clientdata) end + general = function( self ) local service = {} - if self.clientdata.srvcmd then - local srvcmd = self.clientdata.srvcmd - if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then - service.srvcmdresult, service.message = self.model.service_control( srvcmd ) - end - end - local info = { - status=self.model.get_status(), - version = self.model.get_dansguardian_version(), - autostart = self.model.get_autostart(), - srvctrl = { value = srvctrl} - } - - local option = { script = self.conf.script, - prefix = self.conf.prefix, - controller = self.conf.controller, - action = self.conf.action, - extra = "" - } - -- Add a cmd button to the view service.cmdsave = cfe({ name="cmdsave", label="Save/Apply above settings", @@ -64,29 +36,15 @@ general = function( self ) service.cmdsave.descr="* Changes has been saved!" end - service.status = self.model.get_status() service.config, service.cfgerr = self.model.get_general_config() - return ( cfe ({ option = option, service = service, info = info }) ) + return ( cfe ({ service = service }) ) end advanced = function( self ) local service = {} - if self.clientdata.srvcmd then - local srvcmd = self.clientdata.srvcmd - if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then - service.srvcmdresult, service.message = self.model.service_control( srvcmd ) - end - end - local info = { - status=self.model.get_status(), - version = self.model.get_dansguardian_version(), - autostart = self.model.get_autostart(), - srvctrl = { value = srvctrl} - } - local option = { script = self.conf.script, prefix = self.conf.prefix, controller = self.conf.controller, @@ -94,54 +52,13 @@ advanced = function( self ) extra = "" } - service.status = self.model.get_status() service.config, service.cfgerr = self.model.get_advanced_config() - return ( cfe ({ option = option, service = service, info = info }) ) + return ( cfe ({ option = option, service = service }) ) end -plain = function( self ) - - local service = {} - if self.clientdata.srvcmd then - local srvcmd = self.clientdata.srvcmd - if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then - service.srvcmdresult, service.message = self.model.service_control( srvcmd ) - end - end - - local option = { script = self.conf.script, - prefix = self.conf.prefix, - controller = self.conf.controller, - action = self.conf.action, - extra = "" - } - - local info = { - status=self.model.get_status(), - version = self.model.get_dansguardian_version(), - autostart = self.model.get_autostart(), - srvctrl = { value = srvctrl} - } - - -- Add a cmd button to the view - service.cmdsave = cfe({ name="cmdsave", - label="Save/Apply above settings", - value="Save", - type="submit", - }) - - if self.clientdata.cmdsave then - local conf = self.clientdata - local config = conf.config - self.model.update_plain_config( config ) - service.cmdsave.descr="* Changes has been saved!" - end - - service.status = self.model.get_status() - service.config, service.cfgerr = self.model.get_plain_config() - - return ( cfe ({ option = option, service = service, info = info }) ) +expert = function( self ) + return controllerfunctions.handle_form(self, self.model.getconfigfile, self.model.updateconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Set") end edit = function( self ) @@ -150,13 +67,6 @@ edit = function( self ) redirect( self ) end - local option = { script = self.conf.script, - prefix = self.conf.prefix, - controller = self.conf.controller, - action = self.conf.action, - extra = "" - } - local service = { message="", status="", config="" } if self.clientdata.cmd then @@ -166,7 +76,6 @@ edit = function( self ) end end - service.status = self.model.get_status() service.config, service.cfgerr = self.model.get_edit_config( self.clientdata.name ) service.name = self.clientdata.name @@ -174,48 +83,13 @@ edit = function( self ) redirect( self ) end - return ( cfe ({ option = option, service = service }) ) + return ( cfe ({ service = service }) ) end category = function( self ) local service = { message="", status="", config="", cfgerr="" } - if self.clientdata.srvcmd then - local srvcmd = self.clientdata.srvcmd - if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then - service.srvcmdresult, service.message = self.model.service_control( srvcmd ) - end - end - - local info = { - status=self.model.get_status(), - version = self.model.get_dansguardian_version(), - autostart = self.model.get_autostart(), - srvctrl = { value = srvctrl} - } - - local option = { script = self.conf.script, - prefix = self.conf.prefix, - controller = self.conf.controller, - action = self.conf.action, - extra = "" - } - - -- Add a cmd button to the view - service.cmdadd = cfe({ - name="cmdadd", - label="Action", - value="Add", - type="submit", - }) - - service.cmdaddvalue = cfe({ - name="cmdaddvalue", - value="", - type="text", - }) - service.config = {} service.config.categories = cfe({ name="categories", @@ -224,7 +98,7 @@ category = function( self ) }) service.config.categories = self.model.get_categories() - return ( cfe ({ option = option, service = service, info = info }) ) + return ( cfe ({ service = service }) ) end editcategories = function( self ) -- cgit v1.2.3