From ae0254ab80df6f8a8202571bd80d252255ad3e93 Mon Sep 17 00:00:00 2001
From: cmaffio <cmaffioletti@esseweb.eu>
Date: Tue, 26 Apr 2016 11:59:24 +0200
Subject: [PATCH] Fix visualizzazione

---
 proxy/pool_lista.php      | 8 +++-----
 proxy/script/conntrack.pl | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/proxy/pool_lista.php b/proxy/pool_lista.php
index a0b205e..644f07e 100755
--- a/proxy/pool_lista.php
+++ b/proxy/pool_lista.php
@@ -24,10 +24,10 @@ if (isset($_POST['tempo'])) {
 				<option value="YEAR" <?php if ($tempo == "YEAR") {print "selected=\"selected\""; } ?>>Ultimo Anno</option>
 			</select>
 		</td>
-		<td colspan="10" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td colspan="9" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		</td>
 	</tr>
-	<tr><td class="spaziov" colspan=13><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=12><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)";
 $res = mysql_query( $query, $DB_ID );
@@ -81,7 +81,6 @@ while ($dato = mysql_fetch_array ( $res )) {
 		<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="colimg"><img border="0" src="barra.php?max=<?php print $max ?>&val=<?php print $dato['inviati'] ?>&col=red"></td>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		</td>
 	</tr>
 	<tr>
@@ -91,10 +90,9 @@ while ($dato = mysql_fetch_array ( $res )) {
 		<td class="colspeed"><?php print byteConvert($dato['ricevuti']) ?></td>
 		<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>
-		<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 class="spaziov" colspan=12><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
 
 <?php
 } ?>
diff --git a/proxy/script/conntrack.pl b/proxy/script/conntrack.pl
index bee2fbe..4b22bb2 100755
--- a/proxy/script/conntrack.pl
+++ b/proxy/script/conntrack.pl
@@ -173,7 +173,7 @@ sub conntrack {
 			$sem2->up();
 			print "Invio query UPDATE\n" if ($verbose > 1);
 		}
-		last if ($conta >= $limit_thread);
+		return if ($conta >= $limit_thread);
 	}
 	close CT;
 	return;