updates on gui and functionality of squid and dansguardian acfs

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

1 files changed, 12 insertions, 30 deletions

diff --git a/squid-controller.lua b/squid-controller.lua
index 84e60dd..03c6f7b 100644
--- a/squid-controller.lua
+++ b/squid-controller.lua
@@ -88,6 +88,18 @@ authentication = function( self )
 		end
 	end
 	
+	if self.clientdata.inout then
+		if self.clientdata.inout == " << " then
+			local newauth = self.clientdata.authmethod
+			if #self.clientdata.tmpempty > 0 then
+				newauth = newauth .. self.clientdata.tmpempty
+			end
+		else
+		
+		end
+		self.model.upd_authmethod(newauth)
+	end
+	
 	service.status = self.model.get_status()
 	service.config, service.error = self.model.get_basic_config()
 	
@@ -200,33 +212,3 @@ saccess = function( self )
 	return ( cfe ({ option = option, service = service }) )
 end
 
-cfilter = 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.cmd then
-		if self.clientdata.cmd == "save" then
-			local conf = self.clientdata
-			local config = { filterip = conf.filterip, filterport = conf.filterport,
-			                 proxyip = conf.proxyip, proxyport = conf.proxyport,
-			                 accessdeniedaddress = conf.accessdeniedaddress,
-			                 naughtynesslimit = conf.naughtynesslimit
-			               }
-			              
-			self.model.update_filter_config( config )
-		end
-	end
-	
-	service.status = self.model.get_dansguardian_status()
-	service.config, service.cfgerr = self.model.get_filter_config()
-	
-	return ( cfe ({ option = option, service = service }) )
-end
-