fix vari e sistemazioni

2016-05-13 17:02:01 +02:00
parent 2ecc6266d9
commit d01f3a895e
25 changed files with 106 additions and 91 deletions
--- a/DBDiff/proxy.sql
+++ b/DBDiff/proxy.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `proxy_utenti` ADD `guest` INT NOT NULL DEFAULT '0' AFTER `modifica`;
+
+INSERT INTO `pannello_vbc`.`livelli` (`id`, `livello`, `nome`) VALUES (NULL, '1', 'Libero');
+ALTER TABLE `moduli_page` ADD `livello` INT NOT NULL AFTER `pagina`;
--- a/core/function.php
+++ b/core/function.php
@@ -345,7 +345,8 @@ function array_moduli () {
 				moduli.id AS id,
 				moduli.nome AS nome,
 				moduli.directory AS directory,
-				moduli.descrizione AS descrizione
+				moduli.descrizione AS descrizione,
+				permessi.accesso AS accesso
 			FROM
 				utenti
 			JOIN
@@ -358,10 +359,10 @@ function array_moduli () {
 				moduli.attivo = 1
 		";

-	$menu[] =	array("Home", $CONF['base_url']."/core/main.php",0,"Home Page");
+	$menu[] =	array("Home", $CONF['base_url']."/core/main.php",0,"Home Page",0);

 	if ($UTENTE['admin']) {
-		$menu[]	=	array("Configurazione", $CONF['base_url']."/core/conf.php",0,"Modifica configurazione");
+		$menu[]	=	array("Configurazione", $CONF['base_url']."/core/conf.php",0,"Modifica configurazione",0);
 		$query .= "	UNION DISTINCT SELECT
 					moduli.id AS id,
 					moduli.nome AS nome,
@@ -379,7 +380,7 @@ function array_moduli () {
 	$res = mysql_query( $query, $DB_ID );

 	while ($dato = mysql_fetch_array ($res)) {
-		$menu[]	=	array($dato['nome'], $CONF['base_url']."/".$dato['directory']."/index.php",$dato['id'], $dato['descrizione']);
+		$menu[]	=	array($dato['nome'], $CONF['base_url']."/".$dato['directory']."/index.php",$dato['id'], $dato['descrizione'], $dato['accesso']);
 	}

 	$menu[]	=	array("Cambio password", $CONF['base_url']."/core/chkpasswd.php",0,"Cambio Password");
@@ -437,10 +438,12 @@ function lista_moduli () {
 						moduli_page 
 					JOIN
 						moduli
-					ON
-						moduli.id = moduli_page.id_moduli
+						ON
+							moduli.id = moduli_page.id_moduli
 					WHERE 
 						moduli_page.attivo = 1 
+						AND
+						moduli_page.livello <= ".$menu[$i][4]."
 					AND 
 						moduli_page.id_moduli = ".$menu[$i][2]." 
 					ORDER BY 
@@ -465,6 +468,18 @@ function lista_moduli () {
 function diritti ($minimo) {
 	global $UTENTE, $DB_ID, $CONF;

+	$query = "	SELECT
+				livello
+			FROM
+				livelli
+			WHERE
+				nome = '$minimo'
+		";
+
+	$res = mysql_query( $query, $DB_ID );
+	$dato = mysql_fetch_array ($res);	
+	$minimo = $dato['livello'];
+
 	preg_match ('/^'.preg_replace('/\//','\/',$CONF['base_url']).'\/([^\/]+)\/.*/', $_SERVER['REQUEST_URI'], $trovato);
 	$modulo = $trovato[1];

@@ -473,17 +488,25 @@ function diritti ($minimo) {
 			FROM
 				moduli
 			JOIN
-				permessi ON moduli.id = permessi.id_moduli AND permessi.id_utenti = ".$UTENTE['id']."
+				permessi 
+				ON 
+					moduli.id = permessi.id_moduli 
+					AND 
+					permessi.id_utenti = ".$UTENTE['id']."
 			WHERE
 				moduli.directory = '$modulo'
-			AND
+				AND
 				moduli.attivo = 1
 			UNION DISTINCT SELECT 
 				moduli.superadmin 
 			FROM 
 				moduli 
 			JOIN 
-				utenti ON utenti.id = ".$UTENTE['id']." AND utenti.admin = 1 
+				utenti 
+				ON 
+					utenti.id = ".$UTENTE['id']." 
+					AND 
+					utenti.admin = 1 
 			WHERE 
 				moduli.directory = '$modulo'
 		";
@@ -572,4 +595,41 @@ function generateStrongPassword($length = 9, $add_dashes = false, $available_set
 	return $dash_str;
 }

+function html_spazi ($dati) {
+	global $CONF;
+
+	print "<tr>";
+	$somma = 0;
+	foreach ($dati as $riga) {
+		if (!$riga) {
+			$riga = 100 - $somma;
+		} else {
+			$somma += $riga;
+		}	
+?>
+		<td class="sep" width="<?php print $riga ?>%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+<?php	}
+	print "</tr>";
+}
+
+function html_intestazione ($dati, $tipo = array ()) {
+	global $CONF;
+
+	print "<tr>";
+	foreach ($dati as $key => $riga) {
+		if ($riga == "") {
+			$riga = "&nbsp;";
+		}
+
+		if (isset ($tipo[$key]) && $tipo[$key] != "") {
+			$classe = $tipo[$key];
+		} else {
+			$classe = "descrizione";
+		}
+?>
+		<td class="<?php print $classe ?>"><?php print $riga ?></td>
+<?php	}
+	print "</tr>";
+}
+
 ?>
--- a/firewall/index.php
+++ b/firewall/index.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti();
+$DIRITTI = diritti('Libero');



--- a/proxy/acl_edit.php
+++ b/proxy/acl_edit.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_POST['rif']) && $_POST['rif'] != "") {
--- a/proxy/acl_lista.php
+++ b/proxy/acl_lista.php
@@ -1,23 +1,13 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();
 ?>

 <form name="" method="post">
 <table cellpadding="0" cellspacing="0" border="0" width="90%">
-	<tr>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="30%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="10%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="30%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-	</tr>
+<?php	html_spazi (array(5,5,5,30,5,10,5,10,0)); ?>
 	<tr>
 		<td ><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td width="5%"><a href="acl_edit.php"><img src="<?php print $CONF['base_url'] ?>/img/addresource.png"></a></td>
--- a/proxy/index.php
+++ b/proxy/index.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Utente');
 view_top();
 ?>

--- a/proxy/net_acl.php
+++ b/proxy/net_acl.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_POST['id'])) {
@@ -79,29 +79,9 @@ function do_submit() {
 <form name="acl" method="post">
 <table cellpadding="0" cellspacing="0" border="0" width="90%">
 <input type="hidden" name="id" value="<?php print $id ?>">
-	<tr>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="20%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="6%" ><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="6%" ><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="6%" ><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%" ><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="20%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="27%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-	</tr>
-	<tr>
-		<td class="spaziol"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="descrizione">Rete</td>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="radio">Nega</td>
-		<td class="radio">Default</td>
-		<td class="radio">Autorizza</td>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="descrizione">Nome Lista</td>
-		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-	</tr>
-<?php
+<?php	
+html_spazi (array(5,20,5,6,6,6,5,20,0)); 
+html_intestazione (array ("","Rete","","Nega","Default","Autorizza","","Nome Lista",""), array("","","","radio","radio","radio","","",""));
 $res = mysql_query( $query, $DB_ID );
 $conta = 0;
 while ($dato = mysql_fetch_array ( $res )) {
--- a/proxy/net_edit.php
+++ b/proxy/net_edit.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_POST['id'])) {
--- a/proxy/net_lista.php
+++ b/proxy/net_lista.php
@@ -1,24 +1,12 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(10);
+$DIRITTI = diritti('Admin');
 view_top();
 ?>
 <form name="" method="post">
 <table cellpadding="0" cellspacing="0" border="0" width="90%">
-	<tr>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="2%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="5%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="2%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="9%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="2%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="9%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="2%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="15%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="sep" width="44%"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-	</tr>
+<?php	html_spazi (array(5,5,2,5,2,9,2,9,2,15,0)); ?>
 	<tr>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="spazioh"><a href="net_edit.php"><img src="<?php print $CONF['base_url'] ?>/img/addresource.png"></a></td>
--- a/proxy/pool_acl.php
+++ b/proxy/pool_acl.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_POST['id'])) {
--- a/proxy/pool_ip.php
+++ b/proxy/pool_ip.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();
 ?>
 <form name="" method="post">
--- a/proxy/pool_lista.php
+++ b/proxy/pool_lista.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(10);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_POST['tempo'])) {
--- a/proxy/proxy_gest.php
+++ b/proxy/proxy_gest.php
@@ -1,12 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
-
-// _SERVER["HTTP_REFERER"]
-// _SERVER["PHP_SELF"]
-// _SERVER["REQUEST_URI"]
-
+$DIRITTI = diritti('Admin');
 ?>
 <html>
 <head>
--- a/proxy/users_edit.php
+++ b/proxy/users_edit.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_POST['id'])) {
--- a/proxy/users_lista.php
+++ b/proxy/users_lista.php
@@ -1,15 +1,15 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();
 ?>
-
 <table cellpadding="0" cellspacing="0" border="0" width="90%">
+<?php	html_spazi (array (5,5,5,2,10,2,13,2,10,2,10,0)); ?>
 	<tr>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="spazioh"><a href="users_edit.php"><img src="<?php print $CONF['base_url'] ?>/img/addresource.png"></a></td>
-		<td colspan=9 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td colspan=10 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 	</tr>
 <?php
 $query = "	SELECT 
@@ -26,10 +26,9 @@ $query = "	SELECT
 	";

 $res = mysql_query( $query, $DB_ID );
+html_intestazione (array ("","","","","Utente","","Nome Completo","","Ultimo Accesso","","IP Associato",""));
 while ($dato = mysql_fetch_array ( $res )) {
 ?>
-
-
 	<tr>
 <?php
 	if ($dato['attivo']) {
@@ -53,10 +52,10 @@ 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['ip'] ?></td>
-
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		</td>
 	</tr>
-	<tr><td class="spaziov" colspan=11><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=12><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>

 <?php
 } ?>
--- a/proxy/users_pwd.php
+++ b/proxy/users_pwd.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 ?>
 <script type="text/javascript">
 <!--
--- a/routing/index.php
+++ b/routing/index.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 $conf_route = carica_conf('Routing');
--- a/routing/linee.php
+++ b/routing/linee.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(10);
+$DIRITTI = diritti('Admin');
 view_top();
 ?>

--- a/routing/modlinea.php
+++ b/routing/modlinea.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(10);
+$DIRITTI = diritti('Admin');
 view_top();

 $netmask = array(	30	=>	"/30 - 255.255.255.252",
--- a/utenti/dettlogutenti.php
+++ b/utenti/dettlogutenti.php
@@ -1,8 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti();
-//isadmin();
+$DIRITTI = diritti('Admin');
 ?>
 <body>
 <link rel="stylesheet" type="text/css" href="<?php print $CONF['base_url'] ?>/css/stile.css" />
--- a/utenti/index.php
+++ b/utenti/index.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();
 ?>

--- a/utenti/logutenti.php
+++ b/utenti/logutenti.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti();
+$DIRITTI = diritti('Admin');
 //isadmin();
 ?>
 <body>
--- a/utenti/modutenti.php
+++ b/utenti/modutenti.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(10);
+$DIRITTI = diritti('Admin');
 view_top();

 if (isset($_GET['id'])) {
--- a/utenti/permessiutenti.php
+++ b/utenti/permessiutenti.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti(1);
+$DIRITTI = diritti('Admin');
 view_top();

 $query = "	SELECT
--- a/utenti/updatepermessi.php
+++ b/utenti/updatepermessi.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("../core/config.php");
 $UTENTE = login();
-$DIRITTI = diritti();
+$DIRITTI = diritti('Admin');

 $user_id = $_GET['user_id'];
 $accesso = $_GET['accesso'];