From cbf0610ee0f653145a9f4761e4390f92c31097e5 Mon Sep 17 00:00:00 2001
From: cmaffio <cmaffioletti@esseweb.eu>
Date: Wed, 18 May 2016 11:44:29 +0200
Subject: [PATCH] Aggiunta nome IP

---
 DBDiff/condex.sql    |   3 +
 "proxy/\\"           | 156 +++++++++++++++++++++++++++++++++++++++++++
 proxy/index.php      |  35 ++++++++--
 proxy/pool_ip.php    |  93 +++++++++++++-------------
 proxy/pool_lista.php |  14 ++--
 5 files changed, 248 insertions(+), 53 deletions(-)
 create mode 100644 DBDiff/condex.sql
 create mode 100644 "proxy/\\"

diff --git a/DBDiff/condex.sql b/DBDiff/condex.sql
new file mode 100644
index 0000000..4f4b2c3
--- /dev/null
+++ b/DBDiff/condex.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `proxy_pool` ADD `nome` VARCHAR(64) NULL AFTER `id`;
+
+
diff --git "a/proxy/\\" "b/proxy/\\"
new file mode 100644
index 0000000..de2d67c
--- /dev/null
+++ "b/proxy/\\"
@@ -0,0 +1,156 @@
+<?php
+include_once ("../core/config.php");
+$UTENTE = login();
+$DIRITTI = diritti('Admin');
+view_top();
+?>
+<form name="" method="post">
+<table cellpadding="0" cellspacing="0" border="1" width="90%">
+<?php
+if (isset($_GET['id'])) { 
+	$id = $_GET['id'];
+
+	if ((isset($_POST['nomeold'])) && (isset($_POST['nome'])) && ($_POST['oldnome'] != $_POST['nome'])) {
+		print "CAMBIO";
+
+	}
+
+	if (isset($_POST['tempo'])) {
+		$tempo = $_POST['tempo'];
+	} else {
+		$tempo = "DAY";
+	}
+
+	$query = "	SELECT 
+				proxy_pool.attivo,
+				proxy_dati.ip, 
+				proxy_pool.nome, 
+				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
+			AND
+				proxy_dati.data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
+		";
+
+	$res = mysql_query( $query, $DB_ID );
+	$dato = mysql_fetch_array ( $res );
+?>
+	<tr>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td>
+			<select name="tempo" onchange="this.form.submit()">
+				<option value="HOUR" <?php if ($tempo == "HOUR") {print "selected=\"selected\""; } ?>>Ultima Ora</option>
+				<option value="DAY" <?php if ($tempo == "DAY") {print "selected=\"selected\""; } ?>>Ultimo Giorno</option>
+				<option value="WEEK" <?php if ($tempo == "WEEK") {print "selected=\"selected\""; } ?>>Ultima Settimana</option>
+				<option value="MONTH" <?php if ($tempo == "MONTH") {print "selected=\"selected\""; } ?>>Ultimo Mese</option>
+				<option value="YEAR" <?php if ($tempo == "YEAR") {print "selected=\"selected\""; } ?>>Ultimo Anno</option>
+			</select>
+		</td>
+		<td colspan="11" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+	</tr>
+	<tr><td class="spaziov" colspan=13><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+
+<?php 
+html_spazi (array(3,15,2,15,2,2,12,2,12,2,10,2,10,0));
+html_intestazione (array("", "IP", "", "Nome", "", "", "Inizio dati", "", "Fine Dati", "", "Inviati", "", "Ricevuti", "")); 
+?>
+	<tr>
+<?php
+	if ($dato['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>
+<?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>
+<?php	} ?>
+		<td class="colip"><?php print $dato['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 $dato['nome'] ?>">
+			<input type="hidden" name="nomeold" value="<?php print $dato['nome'] ?>">
+		</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/applica.png"></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['first'] ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['last'] ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colspeed"><?php print byteConvert($dato['inviati']) ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colspeed"><?php print byteConvert($dato['ricevuti']) ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+
+	</tr>
+	<tr><td class="spaziov" colspan=13><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td colspan=13 align="center"><img src="<?php print $CONF['base_url'] ?>/proxy/graph.php?ip=<?php print $dato['ip'] ?>&tempo=<?php print $tempo ?>"></td></tr>
+	<tr><td class="spaziov" colspan=13><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+
+<?php
+} else {
+	if (isset($_POST['ip'])) {
+		$ip = $_POST['ip'];
+		$nome = $_POST['nome'];
+		if (isset($_POST['attivo'])) {
+			$attivo = $_POST['attivo'];
+		} else {
+			$attivo = 0;
+		}
+
+		$query = "	INSERT INTO
+					proxy_pool
+				SET
+					ip = '$ip',
+					nome = '$nome',
+					pool = 1,
+					attivo = $attivo,
+					ins = NOW()
+		";
+		$res = mysql_query( $query, $DB_ID );
+
+		if (!$res) {
+			$error_code = mysql_errno();
+			if ($error_code == 1062) { ?>
+	<tr><td class="spaziov" colspan=11><center>Indirizzo IP gia' esistente</center></td></tr>
+			
+<?php			}
+		} else { ?>
+	<script type="text/javascript">
+           window.location = "pool_lista.php"
+      </script>
+<?php		exit;
+		}
+	}
+html_spazi (array(2,10,2,10,2,10,0));
+html_intestazione (array("", "IP", "", "Nome", "", "Limitazione", ""));
+?>
+	<tr>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><input type="text" size="15" name="ip"></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><input type="text" size="15" name="nome"></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><input type="checkbox" name="attivo" value="1"></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+	</tr>
+	<tr><td class="spaziov" colspan=7><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr>
+		<td align="center" colspan="7">
+			<input type="submit" value="Aggiungi">
+			&nbsp;&nbsp;&nbsp;
+			<input type="button" value="Annulla" onclick="location.href = 'pool_lista.php';"></button>
+		</td>
+	</tr>
+<?php 
+} ?>
+</table>
+</form>
+<img src="<?php print $CONF['base_url'] ?>/img/spazio.gif" width="1" height="20" alt="">
+<?php view_footer(); ?>
diff --git a/proxy/index.php b/proxy/index.php
index 9872256..dc58935 100755
--- a/proxy/index.php
+++ b/proxy/index.php
@@ -19,12 +19,35 @@ function PopupG(apri)
 </script>
 <table cellpadding="0" cellspacing="0" border="0" width="90%">
 <?php
-$query = "SELECT GREATEST (max(inviati), max(ricevuti)) AS max from proxy_speed";
+
+$query = "	SELECT 
+			GREATEST (max(inviati), max(ricevuti)) AS max 
+		FROM 
+			proxy_speed
+";
+
 $res = mysql_query( $query, $DB_ID );
 $valori = mysql_fetch_array ( $res );
 $max = $valori['max'];
 
-$query = "SELECT proxy_speed.ip, proxy_speed.ricevuti, proxy_speed.inviati, proxy_pool.attivo FROM proxy_speed JOIN proxy_pool ON proxy_speed.ip = proxy_pool.ip ORDER BY ricevuti desc , inviati desc";
+$query = "	SELECT 
+			proxy_speed.ip, 
+			proxy_speed.ricevuti,
+ 			proxy_speed.inviati, 
+			proxy_pool.attivo,
+			proxy_pool.id,
+			proxy_pool.nome
+		FROM 
+			proxy_speed 
+		JOIN 
+			proxy_pool 
+			ON 
+				proxy_speed.ip = proxy_pool.ip 
+		ORDER BY 
+			ricevuti desc , 
+			inviati desc
+";
+
 $res = mysql_query( $query, $DB_ID );
 while ($dato = mysql_fetch_array ( $res )) {
 ?>
@@ -37,9 +60,9 @@ while ($dato = mysql_fetch_array ( $res )) {
 <?php	} else { ?>
 		<td rowspan=2 class="col3btn"><a href="proxy_gest.php?azione=pool_ins&id=<?php print $dato['ip']?>"><img src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente non limitato" TITLE="Utente non limitato"></a></td>
 <?php	} ?>
-		<td rowspan=2 class="col3btn"><a href="pool_ip.php?ip=<?php print $dato['ip'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/modify.gif" ALT="Dettaglio" TITLE="Dettaglio"></a></td>
+		<td rowspan=2 class="col3btn"><a href="pool_ip.php?id=<?php print $dato['id'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/modify.gif" ALT="Dettaglio" TITLE="Dettaglio"></a></td>
 		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td rowspan=2 class="colip"><?php print $dato['ip'] ?></td>
+		<td <?php if ($dato['nome'] == "") print "rowspan=2" ?> class="colip"><?php print $dato['ip'] ?></td>
 		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="descrizione">Inviati</td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
@@ -49,6 +72,10 @@ while ($dato = mysql_fetch_array ( $res )) {
 		</td>
 	</tr>
 	<tr>
+<?php
+		if ($dato['nome'] != "") { ?>
+		<td class="colip"><?php print $dato['nome'] ?></td>
+<?php		} ?>
 		<td class="descrizione">Ricevuti</td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colspeed"><?php print byteConvert($dato['ricevuti']) ?></td>
diff --git a/proxy/pool_ip.php b/proxy/pool_ip.php
index db2d7c0..9607ae4 100755
--- a/proxy/pool_ip.php
+++ b/proxy/pool_ip.php
@@ -6,10 +6,21 @@ view_top();
 ?>
 <form name="" method="post">
 <table cellpadding="0" cellspacing="0" border="0" width="90%">
-
 <?php
-if (isset($_GET['ip'])) { 
-	$ip = $_GET['ip'];
+if (isset($_GET['id'])) { 
+	$id = $_GET['id'];
+
+	if ((isset($_POST['nomeold'])) && (isset($_POST['nome'])) && ($_POST['oldnome'] != $_POST['nome'])) {
+		$query = "	UPDATE
+					proxy_pool
+				SET
+					nome = '".$_POST['nome']."'
+				WHERE
+					id = $id
+		";
+		$res = mysql_query( $query, $DB_ID );
+	}
+
 	if (isset($_POST['tempo'])) {
 		$tempo = $_POST['tempo'];
 	} else {
@@ -19,6 +30,7 @@ if (isset($_GET['ip'])) {
 	$query = "	SELECT 
 				proxy_pool.attivo,
 				proxy_dati.ip, 
+				proxy_pool.nome, 
 				MIN(proxy_dati.data_destroy) AS first, 
 				MAX(proxy_dati.data_destroy) AS last, 
 				SUM(proxy_dati.inviati) AS inviati,
@@ -30,7 +42,7 @@ if (isset($_GET['ip'])) {
 			ON
 				proxy_dati.ip = proxy_pool.ip
 			WHERE
-				proxy_dati.ip = '$ip'
+				proxy_pool.id = $id
 			AND
 				proxy_dati.data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
 		";
@@ -40,7 +52,7 @@ if (isset($_GET['ip'])) {
 ?>
 	<tr>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td colspan="2">
+		<td>
 			<select name="tempo" onchange="this.form.submit()">
 				<option value="HOUR" <?php if ($tempo == "HOUR") {print "selected=\"selected\""; } ?>>Ultima Ora</option>
 				<option value="DAY" <?php if ($tempo == "DAY") {print "selected=\"selected\""; } ?>>Ultimo Giorno</option>
@@ -49,45 +61,51 @@ if (isset($_GET['ip'])) {
 				<option value="YEAR" <?php if ($tempo == "YEAR") {print "selected=\"selected\""; } ?>>Ultimo Anno</option>
 			</select>
 		</td>
-		<td colspan="6" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td colspan="12" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 	</tr>
-	<tr><td class="spaziov" colspan=9><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=14><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
 
+<?php 
+html_spazi (array(3,15,2,15,2,2,12,2,12,2,10,2,10,0));
+html_intestazione (array("", "IP", "", "Nome", "", "", "Inizio dati", "", "Fine Dati", "", "Inviati", "", "Ricevuti", "")); 
+?>
 	<tr>
 <?php
 	if ($dato['attivo']) {
 ?>
-		<td rowspan=2 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 $ip ?>"><img src="<?php print $CONF['base_url'] ?>/img/non_attivo.gif" ALT="Utente limitato" TITLE="Utente limitato"></a></td>
 <?php	} else { ?>
-		<td rowspan=2 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 $ip ?>"><img src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente non limitato" TITLE="Utente non limitato"></a></td>
 <?php	} ?>
-		<td rowspan=2 class="colip"><?php print $ip ?></td>
-
-		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['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 $dato['nome'] ?>">
+			<input type="hidden" name="nomeold" value="<?php print $dato['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 print $dato['first'] ?></td>
-
-		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="descrizione">Inviati</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['last'] ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colspeed"><?php print byteConvert($dato['inviati']) ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-	</tr>
-	<tr>
-		<td class="colip"><?php print $dato['last'] ?></td>
-		<td class="descrizione">Ricevuti</td>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colspeed"><?php print byteConvert($dato['ricevuti']) ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 
 	</tr>
-	<tr><td class="spaziov" colspan=9><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
-	<tr><td colspan=9 align="center"><img src="<?php print $CONF['base_url'] ?>/proxy/graph.php?ip=<?php print $dato['ip'] ?>&tempo=<?php print $tempo ?>"></td></tr>
-	<tr><td class="spaziov" colspan=9><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=14><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td colspan=14 align="center"><img src="<?php print $CONF['base_url'] ?>/proxy/graph.php?ip=<?php print $dato['ip'] ?>&tempo=<?php print $tempo ?>"></td></tr>
+	<tr><td class="spaziov" colspan=14><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
 
 <?php
 } else {
 	if (isset($_POST['ip'])) {
 		$ip = $_POST['ip'];
+		$nome = $_POST['nome'];
 		if (isset($_POST['attivo'])) {
 			$attivo = $_POST['attivo'];
 		} else {
@@ -98,6 +116,7 @@ if (isset($_GET['ip'])) {
 					proxy_pool
 				SET
 					ip = '$ip',
+					nome = '$nome',
 					pool = 1,
 					attivo = $attivo,
 					ins = NOW()
@@ -107,7 +126,7 @@ if (isset($_GET['ip'])) {
 		if (!$res) {
 			$error_code = mysql_errno();
 			if ($error_code == 1062) { ?>
-	<tr><td class="spaziov" colspan=11><center>Indirizzo IP gia' esistente</center></td></tr>
+	<tr><td class="spaziov" colspan=12><center>Indirizzo IP gia' esistente</center></td></tr>
 			
 <?php			}
 		} else { ?>
@@ -116,43 +135,27 @@ if (isset($_GET['ip'])) {
       </script>
 <?php		exit;
 		}
-
-
 	}
+html_spazi (array(2,10,2,10,2,10,0));
+html_intestazione (array("", "IP", "", "Nome", "", "Limitazione", ""));
 ?>
 	<tr>
-		<td width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="2%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="23%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="2%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="23%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-	</tr>
-	<tr>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colip">Indirizzo IP:</td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colip"><input type="text" size="15" name="ip"></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colip">Limitazione:</td>
+		<td class="colip"><input type="text" size="15" name="nome"></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colip"><input type="checkbox" name="attivo" value="1"></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 	</tr>
-	<tr><td class="spaziov" colspan=11><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=7><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
 	<tr>
-		<td align="center" colspan="11">
+		<td align="center" colspan="7">
 			<input type="submit" value="Aggiungi">
 			&nbsp;&nbsp;&nbsp;
 			<input type="button" value="Annulla" onclick="location.href = 'pool_lista.php';"></button>
 		</td>
 	</tr>
-
-
-
 <?php 
 } ?>
 </table>
diff --git a/proxy/pool_lista.php b/proxy/pool_lista.php
index 78a58ac..4c39c1a 100755
--- a/proxy/pool_lista.php
+++ b/proxy/pool_lista.php
@@ -33,6 +33,7 @@ if (isset($_POST['ordina'])) {
 				<option value="YEAR" <?php if ($tempo == "YEAR") {print "selected=\"selected\""; } ?>>Ultimo Anno</option>
 			</select>
 		</td>
+		<td rowspan=2 class="spaziov" colspan=4><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 	</tr>
 	<tr>
 		<td colspan=2 class="spazioh">Ordinamento:&nbsp;</td>
@@ -44,7 +45,7 @@ if (isset($_POST['ordina'])) {
 			</select>
 		</td>
 	</tr>
-	<tr><td class="spaziov" colspan=12><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=14><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
 <?php
 $query = "SELECT GREATEST (sum(inviati), sum(ricevuti)) AS max from proxy_dati WHERE data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo) GROUP BY ip";
 $res = mysql_query( $query, $DB_ID );
@@ -57,6 +58,7 @@ while ($valori = mysql_fetch_array ( $res )) {
 
 $query = "	SELECT 
 			proxy_pool.id,
+			proxy_pool.nome,
 			proxy_pool.attivo,
 			proxy_dati.ip, 
 			MIN(proxy_dati.data_destroy) AS first, 
@@ -75,6 +77,7 @@ $query = "	SELECT
 			ip
 		UNION DISTINCT SELECT
 			proxy_pool.id,
+			proxy_pool.nome,
 			proxy_pool.attivo,
 			proxy_pool.ip,
 			DATE_SUB(NOW(), INTERVAL 1 $tempo) AS first,
@@ -100,11 +103,11 @@ while ($dato = mysql_fetch_array ( $res )) {
 <?php	} else { ?>
 		<td rowspan=2 class="col3btn"><a href="proxy_gest.php?azione=pool_ins&id=<?php print $dato['ip']?>"><img src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente non limitato" TITLE="Utente non limitato"></a></td>
 <?php	} ?>
-		<td rowspan=2 class="col3btn"><a href="pool_ip.php?ip=<?php print $dato['ip'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/modify.gif" ALT="Dettaglio" TITLE="Dettaglio"></a></td>
+		<td rowspan=2 class="col3btn"><a href="pool_ip.php?id=<?php print $dato['id'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/modify.gif" ALT="Dettaglio" TITLE="Dettaglio"></a></td>
 		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td rowspan=2 class="spazioh"><a href="pool_acl.php?id=<?php print $dato['id'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/edit-regole.gif" ALT="ACL" TITLE="ACL"></a></td>
 		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td rowspan=2 class="colip"><?php print $dato['ip'] ?></td>
+		<td <?php if ($dato['nome'] == "") print "rowspan=2" ?> class="colip"><?php print $dato['ip'] ?></td>
 		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colip"><?php print $dato['first'] ?></td>
 		<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
@@ -116,6 +119,9 @@ while ($dato = mysql_fetch_array ( $res )) {
 		</td>
 	</tr>
 	<tr>
+<?php		if ($dato['nome'] != "") { ?>
+		<td class="colip"><?php print $dato['nome'] ?></td>
+<?php		} ?>
 		<td class="colip"><?php print $dato['last'] ?></td>
 		<td class="descrizione">Ricevuti</td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
@@ -123,7 +129,7 @@ while ($dato = mysql_fetch_array ( $res )) {
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colimg"><img border="0" src="barra.php?max=<?php print $max ?>&val=<?php print $dato['ricevuti'] ?>&col=blue"></td>
 	</tr>
-	<tr><td class="spaziov" colspan=12><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=14><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
 
 <?php
 } ?>