diff --git a/firewall/.history.swp b/firewall/.history.swp new file mode 100644 index 0000000..ddc7bc7 Binary files /dev/null and b/firewall/.history.swp differ diff --git a/firewall/firewall_regole_versointerno.php b/firewall/firewall_regole_versointerno.php index 2396ea4..6d8bb61 100755 --- a/firewall/firewall_regole_versointerno.php +++ b/firewall/firewall_regole_versointerno.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 ";