From d163914661aaeea1d87b09f9e92434f135b2c9c8 Mon Sep 17 00:00:00 2001
From: Claudio Maffioletti <cmaffioletti@esseweb.eu>
Date: Wed, 19 Apr 2017 12:32:58 +0200
Subject: [PATCH] Inizio modifiche per separazione attivita'

---
 .gitignore                                | 2 ++
 core/config.php                           | 4 ++--
 firewall/firewall_regole_versoesterno.php | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ca6c0c..8ea77c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ core/config.php
 squid_pool.log
 script/*.sql
 squid_acl/listip
+.gitignore
+wf/*
diff --git a/core/config.php b/core/config.php
index 732768b..5f3d9bf 100755
--- a/core/config.php
+++ b/core/config.php
@@ -1,9 +1,9 @@
 <?php
 
-$db_data_server = "127.0.0.1";
+$db_data_server = "10.10.0.67";
 $db_data_name = "pannello_vbc";
 $db_data_user = "pannello";
-$db_data_pwd = "Lx7w3e8dNPfwwc3z";
+$db_data_pwd = "zqAMmAP7l8arrrrD";
 
 require_once ("function.php");
 $DB_ID = db_data_connect ();
diff --git a/firewall/firewall_regole_versoesterno.php b/firewall/firewall_regole_versoesterno.php
index 7dc5df6..e2c4820 100755
--- a/firewall/firewall_regole_versoesterno.php
+++ b/firewall/firewall_regole_versoesterno.php
@@ -36,13 +36,15 @@ $query = "	SELECT
 		JOIN
 			livelli
 			ON
-				livelli.nome = 'Utente'
+				(livelli.nome = 'Utente' OR livelli.nome = 'Admin')
 				AND
 				permessi.accesso <= livelli.livello
 		WHERE   
 			permessi.id_moduli = ".$MODULO['id']."
 			AND
 			utenti.attivo = 1
+		GROUP BY
+			utente
 		ORDER BY
 			utente
 ";