diff --git a/firewall/firewall_logs.php b/firewall/firewall_logs.php
index 91516a7..3f501ac 100755
--- a/firewall/firewall_logs.php
+++ b/firewall/firewall_logs.php
@@ -10,6 +10,26 @@ if (isset($_POST['tempo'])) {
 	$tempo = "DAY";
 }
 
+if (isset($_POST['tipo']) && $_POST['tipo'] != '0') {
+	$tipo = $_POST['tipo'];
+	$querytipo1 = "AND firewall_vpn.tipo = '$tipo'";
+	$querytipo2 = "AND firewall_macchine_ext.tipo = '$tipo'";
+} else {
+	$tipo = "";
+	$querytipo1 = "";
+	$querytipo2 = "";
+}
+
+if (isset($_POST['nome']) && $_POST['nome'] != '0') {
+	$nome = $_POST['nome'];
+	$querynome1 = "AND firewall_versointerno.nome = '$nome'";
+	$querynome2 = "AND firewall_versoesterno.nome = '$nome'";
+} else {
+	$nome = "";
+	$querynome1 = "";
+	$querynome2 = "";
+}
+
 if (isset($_POST['idutente']) && $_POST['idutente'] > 0) {
 	$idutente = $_POST['idutente'];
 	$queryutente = "AND utenti.id = $idutente";
@@ -44,24 +64,39 @@ $query_user = "	SELECT
 ";
 $res_user = mysql_query( $query_user, $DB_ID );
 
-$query_ip = "	SELECT
-			firewall_macchine.id_proxy_pool AS id,
-			proxy_pool.nome,
-			proxy_pool.ip
+$query_nome = "	SELECT
+			nome
 		FROM 
-			firewall_macchine
-		JOIN
-			proxy_pool
-			ON
-				firewall_macchine.id_proxy_pool = proxy_pool.id
+			firewall_versoesterno
+		UNION SELECT
+			nome
+		FROM
+			firewall_versointerno
+		GROUP BY
+			nome
 		ORDER BY
-			-proxy_pool.nome DESC,
-			INET_ATON(proxy_pool.ip) ASC
+			nome
 ";
-$res_ip = mysql_query( $query_ip, $DB_ID );
+$res_nome = mysql_query( $query_nome, $DB_ID );
+
+$query_tipo = "	SELECT
+			tipo
+		FROM
+			firewall_vpn
+		UNION SELECT
+			tipo
+		FROM
+			firewall_macchine_ext
+		GROUP BY
+			tipo
+		ORDER BY
+			tipo
+";
+$res_tipo = mysql_query( $query_tipo, $DB_ID );
 ?>
 <form name="" method="post">
-<?php $tabella = new html (1,"90%", array (3,12,2,10,2,10,2,15,2,15,2,5,2,5,2,5,0)); ?>
+<?php $tabella = new html (0,"90%", array (3,12,2,10,2,10,2,15,2,15,2,5,2,5,2,5,0)); 
+$tabella->intestazione (array("", "Data", "", "Utente", "", "Nome Regola", "", "", "", "", "", "", "", "Tipo", "", "", "")); ?>
 	<tr>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="spazioh">
@@ -83,15 +118,32 @@ $res_ip = mysql_query( $query_ip, $DB_ID );
 			</select>
 		</td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td colspan=3 class="spazioh">
-			<select name="idip" onchange="this.form.submit()">
+		<td class="spazioh">
+			<select name="nome" onchange="this.form.submit()">
 				<option value=0 <?php if ($idip == 0) {print "selected=\"selected\""; } ?>>----</option>
-<?php while ($dato = mysql_fetch_array ( $res_ip )) { ?>
-				<option value="<?php print $dato['id'] ?>" <?php if ($idip == $dato['id']) {print "selected=\"selected\""; } ?>><?php print $dato['ip']; if ($dato['nome'] != "") print " (".$dato['nome'].")" ?></option>
+<?php while ($dato = mysql_fetch_array ( $res_nome )) { ?>
+				<option value="<?php print $dato['nome'] ?>" <?php if ($nome == $dato['nome']) {print "selected=\"selected\""; } ?>><?php print $dato['nome'] ?></option>
 <?php } ?>
 			</select>
 		</td>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh">
+			<select name="tipo" onchange="this.form.submit()">
+				<option value=0 <?php if ($idip == 0) {print "selected=\"selected\""; } ?>>----</option>
+<?php while ($dato = mysql_fetch_array ( $res_tipo )) { ?>
+				<option value="<?php print $dato['tipo'] ?>" <?php if ($tipo == $dato['tipo']) {print "selected=\"selected\""; } ?>><?php print $dato['tipo']; ?></option>
+<?php } ?>
+			</select>
+		</td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
+		<td class="spazioh"></td>
 	</tr>
 <?php
 $tabella->riga();
@@ -110,7 +162,7 @@ $query = "	SELECT
 			proxy_pool.ip AS int_ip,
 			firewall_macchine_ext.nome AS ext_nome,
 			firewall_macchine_ext.ip AS ext_ip,
-			'Forward' AS tipo
+			firewall_macchine_ext.tipo
 		FROM
 			firewall_logs
 		JOIN
@@ -128,6 +180,7 @@ $query = "	SELECT
 			firewall_versoesterno
 			ON
 				firewall_versoesterno_regole.id_firewall_versoesterno = firewall_versoesterno.id
+				$querynome2
 		JOIN
 			firewall_macchine
 			ON
@@ -140,17 +193,63 @@ $query = "	SELECT
 		JOIN
 			firewall_macchine_ext
 			ON
-				firewall_versoesterno.id_firewall_macchine_ext = firewall_macchine_ext.id	
+				firewall_versoesterno.id_firewall_macchine_ext = firewall_macchine_ext.id
+				$querytipo2
+		WHERE
+			firewall_logs.data >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
+
+		UNION
+
+		SELECT 
+			firewall_logs.tabella,
+			firewall_logs.stato,
+			DATE_FORMAT(firewall_logs.data, '%d.%m.%Y %H:%i:%s') AS data,
+			utenti.utente,
+			firewall_versointerno.nome AS reg_nome,
+			firewall_versointerno.int_port,
+			firewall_versointerno.fw_port,
+			firewall_versointerno.proto,
+			proxy_pool.nome AS int_nome,
+			proxy_pool.ip AS int_ip,
+			firewall_vpn.utenza AS ext_nome,
+			firewall_vpn.ip AS ext_ip,
+			firewall_vpn.tipo
+		FROM
+			firewall_logs
+		JOIN
+			utenti
+			ON
+				firewall_logs.id_utenti = utenti.id
+				$queryutente
+		JOIN
+			firewall_versointerno_regole
+			ON
+				firewall_logs.id_regole = firewall_versointerno_regole.id
+				AND
+				firewall_logs.tabella = firewall_versointerno_regole.regola
+		JOIN
+			firewall_versointerno
+			ON
+				firewall_versointerno_regole.id_firewall_versointerno = firewall_versointerno.id
+				$querynome1
+		JOIN
+			firewall_macchine
+			ON
+				firewall_versointerno.id_firewall_macchine = firewall_macchine.id
+		JOIN
+			proxy_pool
+			ON
+				firewall_macchine.id_proxy_pool = proxy_pool.id
+				$queryip
+		JOIN
+			firewall_vpn
+			ON
+				firewall_versointerno.id_firewall_vpn = firewall_vpn.id	
+				$querytipo1
 		WHERE
 			firewall_logs.data >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
 		ORDER BY 
-			firewall_logs.data DESC
-
-
-
-
-
-
+			data DESC
 
 ";
 
@@ -181,9 +280,8 @@ while ($dato = mysql_fetch_array ( $res )) {
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colip"><?php print $dato['tipo'] ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colip"><?php print $dato['stato'] ?></td>
+		<td class="colip"><?php print $stato[$dato['stato']] ?></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		</td>
 	</tr>
 <?php
 }