daily update on the acf-squid module (separated dansguardian config from squid config)

git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@373 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 33 insertions, 1 deletions

diff --git a/dansguardian-controller.lua b/dansguardian-controller.lua
index e749965..db72884 100644
--- a/dansguardian-controller.lua
+++ b/dansguardian-controller.lua
@@ -43,7 +43,7 @@ general = function( self )
 	if self.clientdata.srvcmd then
 		srvcmd = self.clientdata.srvcmd
 		if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then
-			self.model.service_control( srvcmd )
+			service.message = self.model.service_control( srvcmd )
 		end
 	end
 	
@@ -66,3 +66,35 @@ general = function( self )
 	return ( cfe ({ option = option, service = service }) )
 end
 
+plain = function( self )
+
+	local option = { script = ENV["SCRIPT_NAME"],
+	                 prefix = self.conf.prefix,
+	                 controller = self.conf.controller,
+	                 action = self.conf.action,
+	                 extra = ""
+	               }
+	               
+	local service = { message="", status="", config="" }
+	
+	if self.clientdata.srvcmd then
+		srvcmd = self.clientdata.srvcmd
+		if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then
+			service.message = self.model.service_control( srvcmd )
+		end
+	end
+	
+	if self.clientdata.cmd then
+		if self.clientdata.cmd == "save" then
+			local conf = self.clientdata
+			local config = conf.config
+			self.model.update_plain_config( config )
+		end
+	end
+
+	service.status = self.model.get_status()
+	service.config, service.cfgerr = self.model.get_plain_config()
+	
+	return ( cfe ({ option = option, service = service }) )
+end
+