Fix lista IP aggiuna macchina in firewall

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>