diff --git a/proxy/acl_edit.php b/proxy/acl_edit.php
index 80e07cc..86bd418 100755
--- a/proxy/acl_edit.php
+++ b/proxy/acl_edit.php
@@ -14,24 +14,24 @@ if (isset($_POST['rif']) && $_POST['rif'] != "") {
idacllist = $id,
rif = '$rif',
attivo = 1,
- data = NOW();
+ dflt = $dflt,
+ data = NOW()
";
-
$res = mysql_query( $query, $DB_ID );
} elseif (isset($_POST['id'])) {
$id = $_POST['id'];
$nome = $_POST['nome'];
-
+ $dflt = $_POST['dflt'];
if ($id) {
$query = " UPDATE
proxy_acl_list
SET
nome = '$nome',
+ dflt = $dflt,
data = NOW()
WHERE
- id = $id
+ id = $id";
$res = mysql_query( $query, $DB_ID );
- ";
} else {
$query = " INSERT INTO
proxy_acl_list
@@ -39,6 +39,7 @@ if (isset($_POST['rif']) && $_POST['rif'] != "") {
nome = '$nome',
attivo = 1,
sys = 0,
+ dflt = $dflt,
data = NOW()
";
$res = mysql_query( $query, $DB_ID );
@@ -102,29 +103,43 @@ if ($dato['attivo']) {
|
 |
|
+  |
+
+  |
+
+  |
+
+
+
+ |
 |
|
-  |
+  |
-  |
-
-
+  |
-
-
-
 |
Nuova destinazione |
|
 |
-
-
|
-  |
+  |
@@ -139,10 +154,8 @@ if ($dato['attivo']) {
|
 |
-
-
diff --git a/proxy/pool_acl.php b/proxy/pool_acl.php
index 07f1fc4..bfacd74 100755
--- a/proxy/pool_acl.php
+++ b/proxy/pool_acl.php
@@ -57,7 +57,7 @@ $query = " SELECT
proxy_acl_list.id,
proxy_acl_list.nome,
proxy_acl_list.sys,
- 0
+ proxy_acl_list.dflt
FROM
proxy_acl_list
WHERE
diff --git a/proxy/squid_acl/squid_acl.pl b/proxy/squid_acl/squid_acl.pl
index f1184db..1c60d10 100755
--- a/proxy/squid_acl/squid_acl.pl
+++ b/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;
}
-
-
-
}
diff --git a/risorse/stili/stile.css b/risorse/stili/stile.css
index 0a8ec1b..ac4773c 100644
--- a/risorse/stili/stile.css
+++ b/risorse/stili/stile.css
@@ -31,6 +31,7 @@ input.valore { font-family: verdana; font-size: 12px; text-align: right; vertic
td.campoc { font-family: verdana; font-size: 14px; text-align: center; vertical-align:text-top; text-decoration: none; color: #000000; }
td.valorec { font-family: verdana; font-size: 14px; text-align: center; vertical-align:text-top; text-decoration: none; color: #000000; }
td.descrizione { font-family: verdana; font-size: 11px; text-align: left; width:50px; text-decoration: none; color: #8e8e8e; }
+td.descrizione_c{ font-family: verdana; font-size: 11px; text-align: center; width:50px; text-decoration: none; color: #8e8e8e; }
td.spaziol { font-family: verdana; font-size: 11px; text-align: left; height:1px; text-decoration: none; color: #8e8e8e; }
td.radio { font-family: verdana; font-size: 11px; text-align: center; height:1px; text-decoration: none; color: #8e8e8e; }
td.sep { font-family: verdana; font-size: 1px; text-align: left; height:1px; text-decoration: none; color: #8e8e8e; }