fix acl

proxy/squid_acl/squid_acl.pl

@@ -44,13 +44,9 @@ while($limit) {
 			print "OK\n";
 		} else {
 			print LOG "$param[0] - $param[1] - $param[2] - ERR\n";
-			print "DENY\n";
+			print "DENY2\n";
 		}
 	}
-	
-
-#	next if ($query eq "");
-
 }
 exit;
 
@@ -109,6 +105,31 @@ sub cerca {
 					proxy_acl_list.nome = 'ALL'
 				WHERE
 					proxy_pool.ip = '$ip'
+			UNION DISTINCT SELECT
+					1
+				FROM
+					proxy_acl
+				JOIN
+					proxy_acl_list
+					ON
+					proxy_acl_list.id = proxy_acl.idacllist
+				WHERE
+					LOCATE(proxy_acl.rif, '$url') > 0
+					AND
+					proxy_acl_list.dflt = $stato
+					AND
+					proxy_acl_list.id NOT IN (
+						SELECT
+							proxy_acl_ip.idacllist
+						FROM
+							proxy_acl_ip
+						JOIN
+							proxy_pool
+						ON
+							proxy_pool.id = proxy_acl_ip.idpool
+					WHERE
+						proxy_pool.ip = '$ip'
+					)
 	";
 
 #	print "$query\n";
@@ -120,7 +141,4 @@ sub cerca {
 	} else {
 		return 0;
 	}
-
-
-
 }