diff --git a/condes/index.php b/condes/index.php
index 6296e7e..24f020b 100644
--- a/condes/index.php
+++ b/condes/index.php
@@ -85,6 +85,12 @@ $tabella = new html (0,"90%",array(15,2,20,2,15,2,5,0));
 <?php 
 $tabella->riga ();
 
+if ($DIRITTI < 10) {
+	$admin = " AND utenti.id = ".$UTENTE['id'];
+} else {
+	$admin = "";
+}
+
 $query = "	SELECT 
 			condes_regole.id,
 			condes_regole.stato,
@@ -98,8 +104,7 @@ $query = "	SELECT
 			utenti
 			ON
 				condes_regole.id_utenti = utenti.id
-				AND
-				utenti.id = ".$UTENTE['id']."
+				$admin
 		JOIN
 			condes_macchine
 			ON
diff --git a/firewall/firewall_regole_versointerno.php b/firewall/firewall_regole_versointerno.php
index 86ab79a..d40f9fb 100755
--- a/firewall/firewall_regole_versointerno.php
+++ b/firewall/firewall_regole_versointerno.php
@@ -62,7 +62,7 @@ $query = "	SELECT
 ";
 $res_macchine = mysql_query( $query, $DB_ID );
 
-$tabella = new html (0,"90%",array(3,3,2,15,2,15,2,5,0));
+$tabella = new html (0,"90%",array(3,3,2,15,2,30,2,5,0));
 ?>
 <form name="" method="post">
 	<tr>
diff --git a/firewall/firewall_regoleinterno.php b/firewall/firewall_regoleinterno.php
index 480ab67..c145e3f 100755
--- a/firewall/firewall_regoleinterno.php
+++ b/firewall/firewall_regoleinterno.php
@@ -65,7 +65,7 @@ $query = "      SELECT
 $res_ip = mysql_query( $query, $DB_ID );
 while( $row = mysql_fetch_assoc( $res_ip) ) { $listaportefw[] = $row['fw_port']; }
 
-$tabella = new html (0,"90%",array(3,3,2,15,2,15,5,2,15,5,2,5,2,15,0));
+$tabella = new html (0,"90%",array(3,3,2,15,2,15,8,2,15,5,2,5,2,15,0));
 ?>
 <form name="" method="post">
 	<tr>
@@ -96,8 +96,13 @@ $tabella = new html (0,"90%",array(3,3,2,15,2,15,5,2,15,5,2,5,2,15,0));
 			<select name="fw_port">
 				<option value="" selected="selected">---</option>
 <?php for ($i = $FW_conf['FWPort_min']; $i <= $FW_conf['FWPort_max']; $i++ ) {
-        if (in_array($i, $listaportefw) ) continue; ?>
-				<option value="<?php print $i ?>"><?php print $i ?></option>
+        if (in_array($i, $listaportefw) ) { 
+		$aster = "*";
+	} else { 
+		$aster = "";
+	} 
+?>
+				<option value="<?php print $i ?>"><?php print $i.$aster ?></option>
 <?php } ?>
 			</select>
 		</td>
diff --git a/firewall/index.php b/firewall/index.php
index 97d24fe..4da6e77 100755
--- a/firewall/index.php
+++ b/firewall/index.php
@@ -103,7 +103,7 @@ if (isset($_POST['regola'])) {
 	if ($modificato) attiva_aggiornamento();
 }
 
-$tabella = new html (0,"90%",array(15,2,30,2,5,0));
+$tabella = new html (0,"90%",array(15,2,50,2,5,0));
 ?>
 <form name="" method="post">
 <input type="hidden" name="utente" value="<?php print $UTENTE['id'] ?>">
@@ -163,6 +163,7 @@ $query = "	SELECT
 		ORDER BY
 			firewall_versointerno.nome
 	";
+
 $res = mysql_query( $query, $DB_ID );
 while ($dato = mysql_fetch_array ( $res )) { ?>
 	<tr>
@@ -192,7 +193,7 @@ while ($dato = mysql_fetch_array ( $res )) { ?>
 				} else { 
 					print $dato['int_ip'];
 				} 
-				print ":".$dato['fw_port']." (".$dato['proto'].")";;
+				print ":".$dato['int_port']." (".$dato['proto'].")";;
 ?></td>
 		<td class="textc"><?php if ($dato['permanente']) print "Si"; else print "No"; ?></td>
 	</tr>
diff --git a/proxy/pool_ip.php b/proxy/pool_ip.php
index 1975d24..87c2142 100755
--- a/proxy/pool_ip.php
+++ b/proxy/pool_ip.php
@@ -7,7 +7,7 @@ view_top();
 <form name="" method="post">
 <?php
 if (isset($_GET['id'])) { 
-	$tabella = new html (0,"90%",array(3,15,2,15,2,2,12,2,12,2,10,2,10,0));
+	$tabella = new html (0,"90%",array(3,15,2,25,2,2,12,2,12,2,10,2,10,0));
 	$id = $_GET['id'];
 
 	if ((isset($_POST['nomeold'])) && (isset($_POST['nome'])) && ($_POST['oldnome'] != $_POST['nome'])) {
@@ -27,47 +27,65 @@ if (isset($_GET['id'])) {
 		$tempo = "DAY";
 	}
 
-	$query = "	SELECT 
+	$query = "	SELECT
 				proxy_pool.attivo,
-				proxy_dati.ip, 
-				proxy_pool.nome, 
+				proxy_pool.ip,
+				proxy_pool.nome
+			FROM
+				proxy_pool
+			WHERE
+				proxy_pool.id = $id
+		";
+
+	$res = mysql_query( $query, $DB_ID );
+	$pool = mysql_fetch_array ( $res );
+
+	$query1 = "	SELECT 
 				MIN(proxy_dati.data_destroy) AS first, 
 				MAX(proxy_dati.data_destroy) AS last, 
 				SUM(proxy_dati.inviati) AS inviati,
 				SUM(proxy_dati.ricevuti) AS ricevuti
 			FROM
 				proxy_dati
-			JOIN
-				proxy_pool
-			ON
-				proxy_dati.ip = proxy_pool.ip
 			WHERE
-				proxy_pool.id = $id
+				ip = '".$pool['ip']."'
 			AND
-				proxy_dati.data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
-			UNION SELECT
-				proxy_pool.attivo,
-				proxy_dati_storico.ip, 
-				proxy_pool.nome, 
+			proxy_dati.data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
+		";
+
+	$query2 = " 	SELECT
 				MIN(proxy_dati_storico.data_destroy) AS first, 
 				MAX(proxy_dati_storico.data_destroy) AS last, 
 				SUM(proxy_dati_storico.inviati) AS inviati,
 				SUM(proxy_dati_storico.ricevuti) AS ricevuti
 			FROM
 				proxy_dati_storico
-			JOIN
-				proxy_pool
-			ON
-				proxy_dati_storico.ip = proxy_pool.ip
 			WHERE
-				proxy_pool.id = $id
+				ip = '".$pool['ip']."'
 			AND
 				proxy_dati_storico.data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
 		";
 
-	$res = mysql_query( $query, $DB_ID );
-	$dato1 = mysql_fetch_array ( $res );
-	$dato2 = mysql_fetch_array ( $res );
+	$res1 = mysql_query( $query1, $DB_ID );
+	$data1 = mysql_fetch_array ( $res1 );
+	$res2 = mysql_query( $query2, $DB_ID );
+	$data2 = mysql_fetch_array ( $res2 );
+
+	if (is_null ($data1['first'])) {
+		$first = $data2['first'];
+	} elseif (is_null ($data2['first'])) {
+		$first = $data1['first'];
+	} else {
+		$first = min ($data1['first'], $data2['first']);
+	}
+
+	if (is_null ($data1['last'])) {
+		$last  = $data2['last'];
+	} elseif (is_null ($data2['last'])) {
+		$last  = $data1['last'];
+	} else {
+		$last  = max ($data1['last'], $data2['last']);
+	}
 ?>
 	<tr>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
@@ -88,34 +106,34 @@ $tabella->intestazione (array("", "IP", "", "Nome", "", "", "Inizio dati", "", "
 ?>
 	<tr>
 <?php
-	if ($dato1['attivo']) {
+	if ($pool['attivo']) {
 ?>
-		<td class="col3btn"><a href="proxy_gest.php?azione=pool_rem&id=<?php print $ip ?>"><img src="<?php print $CONF['base_url'] ?>/img/non_attivo.gif" ALT="Utente limitato" TITLE="Utente limitato"></a></td>
+		<td class="col3btn"><a href="proxy_gest.php?azione=pool_rem&id=<?php print $pool['ip'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/non_attivo.gif" ALT="Utente limitato" TITLE="Utente limitato"></a></td>
 <?php	} else { ?>
-		<td class="col3btn"><a href="proxy_gest.php?azione=pool_ins&id=<?php print $ip ?>"><img src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente non limitato" TITLE="Utente non limitato"></a></td>
+		<td class="col3btn"><a href="proxy_gest.php?azione=pool_ins&id=<?php print $pool['ip'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente non limitato" TITLE="Utente non limitato"></a></td>
 <?php	} ?>
-		<td class="colip"><?php if ($dato1['ip'] != "") { print $dato1['ip']; } else { print $dato2['ip']; }  ?></td>
+		<td class="colip"><?php print $pool['ip'] ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colip">
-			<input type="text" name="nome" value="<?php print $dato1['nome'] ?>">
-			<input type="hidden" name="nomeold" value="<?php print $dato1['nome'] ?>">
+			<input type="text" name="nome" value="<?php print $pool['nome'] ?>">
+			<input type="hidden" name="nomeold" value="<?php print $pool['nome'] ?>">
 		</td>
 		<td class="spazioh">
 			<input name="modifica" type="image" src="<?php print $CONF['base_url'] ?>/img/applica.png" alt="Modifica" title="Modifica">
 		</td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colip"><?php if ($dato2['first'] != "") { print $dato2['first']; } else { print $dato1['first']; } ?></td>
+		<td class="colip"><?php print $first ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colip"><?php if ($dato1['last'] != "") { print $dato1['last']; } else { print $dato2['last']; } ?></td>
+		<td class="colip"><?php print $last ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colspeed"><?php print byteConvert($dato1['inviati']+$dato2['inviati']) ?></td>
+		<td class="colspeed"><?php print byteConvert($data1['inviati']+$data2['inviati']) ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colspeed"><?php print byteConvert($dato1['ricevuti']+$dato2['ricevuti']) ?></td>
+		<td class="colspeed"><?php print byteConvert($data1['ricevuti']+$data2['ricevuti']) ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 	</tr>
 <?php	
 $tabella->riga(); ?>
-	<tr><td colspan=14 align="center"><img src="<?php print $CONF['base_url'] ?>/proxy/graph.php?ip=<?php if ($dato1['ip'] != "") { print $dato1['ip']; } else { print $dato2['ip']; } ?>&tempo=<?php print $tempo ?>"></td></tr>
+	<tr><td colspan=14 align="center"><img src="<?php print $CONF['base_url'] ?>/proxy/graph.php?ip=<?php print $pool['ip'] ?>&tempo=<?php print $tempo ?>"></td></tr>
 <?php	
 $tabella->riga(); 
 } else {
@@ -144,9 +162,17 @@ $tabella->riga();
 			if ($error_code == 1062) { ?>
 	<tr><td class="spaziov" colspan=12><center>Indirizzo IP gia' esistente</center></td></tr>
 <?php			}
-		} else { ?>
+		} else { 
+			$query = "SELECT id FROM proxy_pool WHERE ip = '$ip'";
+			$res = mysql_query( $query, $DB_ID );
+			$ritorno = mysql_fetch_array ( $res );
+
+
+
+
+?>
 	<script type="text/javascript">
-           window.location = "pool_lista.php"
+           window.location = "pool_acl.php?id=<?php print $ritorno['id']?>"
       </script>
 <?php		exit;
 		}