From 7ad4ca50143f3408b84ab4959dff83d5458cf082 Mon Sep 17 00:00:00 2001
From: Claudio Maffioletti <cmaffioletti@esseweb.eu>
Date: Wed, 26 Jul 2017 14:46:24 +0200
Subject: [PATCH] Fix lista IP aggiuna macchina in firewall

---
 .gitignore                     |  2 +-
 core/config.php                |  6 +--
 firewall/firewall_macchine.php |  6 +--
 whitefox/index.php             | 74 ----------------------------------
 4 files changed, 7 insertions(+), 81 deletions(-)
 delete mode 100755 whitefox/index.php

diff --git a/.gitignore b/.gitignore
index 8ea77c9..986729d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ squid_pool.log
 script/*.sql
 squid_acl/listip
 .gitignore
-wf/*
+whitefox
diff --git a/core/config.php b/core/config.php
index 6d93a01..21ca7fe 100755
--- a/core/config.php
+++ b/core/config.php
@@ -1,9 +1,9 @@
 <?php
 
-$db_data_server = "127.0.0.1";
-$db_data_name = "pannello";
+$db_data_server = "10.10.0.67";
+$db_data_name = "pannello_vbc";
 $db_data_user = "pannello";
-$db_data_pwd = "zqAMmAP8l8arrrrD";
+$db_data_pwd = "zqAMmAP7l8arrrrD";
 
 require_once ("function.php");
 $DB_ID = db_data_connect ();
diff --git a/firewall/firewall_macchine.php b/firewall/firewall_macchine.php
index f0fb0f7..9529fed 100755
--- a/firewall/firewall_macchine.php
+++ b/firewall/firewall_macchine.php
@@ -25,8 +25,8 @@ $query = "	SELECT
 		WHERE
 			id NOT IN (SELECT id_proxy_pool FROM firewall_macchine)
 		ORDER BY
-			-nome DESC,
-			INET_ATON(ip) ASC
+			INET_ATON(ip) ASC,
+			-nome DESC
 ";
 
 $res = mysql_query( $query, $DB_ID );
@@ -41,7 +41,7 @@ $tabella = new html (0,"90%",array(3,3,2,15,2,15,2,15,0));
 			<select name="id">
 				<option value="" selected="selected">---</option>
 <?php while ($dato = mysql_fetch_array ( $res )) { ?>
-				<option value="<?php print $dato['id'] ?>"><?php print $dato['nome']." - ".$dato['ip'] ?></option>
+				<option value="<?php print $dato['id'] ?>"><?php print $dato['ip']." - ".$dato['nome'] ?></option>
 <?php } ?>
 			</select>
 		</td>
diff --git a/whitefox/index.php b/whitefox/index.php
deleted file mode 100755
index 771e0fe..0000000
--- a/whitefox/index.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-include_once ("../core/config.php");
-$UTENTE = login();
-$DIRITTI = diritti('Utente');
-view_top();
-?>
-<meta http-equiv="refresh" content="10">
-<?php
-$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,
-			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 );
-
-$tabella = new html (0,"90%", array (3,3,2,20,2,8,2,10,2,0));
-while ($dato = mysql_fetch_array ( $res )) {
-?>
-	<tr>
-<?php
-	if ($dato['attivo']) {
-?>
-		<td rowspan=2 class="col3btn"><a href="proxy_gest.php?azione=pool_rem&id=<?php print $dato['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 $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?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 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>
-		<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>
-	</tr>
-	<tr>
-		<td class="colip"><?php if ($dato['nome'] != "") { print $dato['nome']; } else { $host = gethostbyaddr ($dato['ip']); print substr($host, 0, strpos($host, ".")); } ?></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>
-		<td class="colimg"><img border="0" src="barra.php?max=<?php print $max ?>&val=<?php print $dato['ricevuti'] ?>&col=blue"></td>
-
-	</tr>
-<?php
-$tabella->riga();
-} 
-$tabella->close();
-view_footer(); 
-?>