cmaffio/pannello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix vari e sistemazioni

Browse Source
This commit is contained in:
cmaffio
2016-05-13 17:02:01 +02:00
parent 2ecc6266d9
commit d01f3a895e
25 changed files with 106 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DBDiff/proxy.sql Normal file
View File

@@ -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`;

78
core/function.php
View File

@@ -345,7 +345,8 @@ function array_moduli () {
moduli.id AS id, moduli.id AS id,
moduli.nome AS nome, moduli.nome AS nome,
moduli.directory AS directory, moduli.directory AS directory,
moduli.descrizione AS descrizione moduli.descrizione AS descrizione,
permessi.accesso AS accesso
FROM FROM
utenti utenti
JOIN JOIN
@@ -358,10 +359,10 @@ function array_moduli () {
moduli.attivo = 1 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']) { 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 $query .= " UNION DISTINCT SELECT
moduli.id AS id, moduli.id AS id,
moduli.nome AS nome, moduli.nome AS nome,
@@ -379,7 +380,7 @@ function array_moduli () {
$res = mysql_query( $query, $DB_ID ); $res = mysql_query( $query, $DB_ID );
while ($dato = mysql_fetch_array ($res)) { 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"); $menu[] = array("Cambio password", $CONF['base_url']."/core/chkpasswd.php",0,"Cambio Password");
@@ -437,10 +438,12 @@ function lista_moduli () {
moduli_page moduli_page
JOIN JOIN
moduli moduli
ON ON
moduli.id = moduli_page.id_moduli moduli.id = moduli_page.id_moduli
WHERE WHERE
moduli_page.attivo = 1 moduli_page.attivo = 1
AND
moduli_page.livello <= ".$menu[$i][4]."
AND AND
moduli_page.id_moduli = ".$menu[$i][2]." moduli_page.id_moduli = ".$menu[$i][2]."
ORDER BY ORDER BY
@@ -465,6 +468,18 @@ function lista_moduli () {
function diritti ($minimo) { function diritti ($minimo) {
global $UTENTE, $DB_ID, $CONF; 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); preg_match ('/^'.preg_replace('/\//','\/',$CONF['base_url']).'\/([^\/]+)\/.*/', $_SERVER['REQUEST_URI'], $trovato);
$modulo = $trovato[1]; $modulo = $trovato[1];
@@ -473,17 +488,25 @@ function diritti ($minimo) {
FROM FROM
moduli moduli
JOIN 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 WHERE
moduli.directory = '$modulo' moduli.directory = '$modulo'
AND AND
moduli.attivo = 1 moduli.attivo = 1
UNION DISTINCT SELECT UNION DISTINCT SELECT
moduli.superadmin moduli.superadmin
FROM FROM
moduli moduli
JOIN JOIN
utenti ON utenti.id = ".$UTENTE['id']." AND utenti.admin = 1 utenti
ON
utenti.id = ".$UTENTE['id']."
AND
utenti.admin = 1
WHERE WHERE
moduli.directory = '$modulo' moduli.directory = '$modulo'
"; ";
@@ -572,4 +595,41 @@ function generateStrongPassword($length = 9, $add_dashes = false, $available_set
return $dash_str; 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>";
}
?> ?>

2
firewall/index.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(); $DIRITTI = diritti('Libero');

2
proxy/acl_edit.php
View File

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

14
proxy/acl_lista.php
View File

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

2
proxy/index.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(1); $DIRITTI = diritti('Utente');
view_top(); view_top();
?> ?>

28
proxy/net_acl.php
View File

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

2
proxy/net_edit.php
View File

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

16
proxy/net_lista.php
View File

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

2
proxy/pool_acl.php
View File

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

2
proxy/pool_ip.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(1); $DIRITTI = diritti('Admin');
view_top(); view_top();
?> ?>
<form name="" method="post"> <form name="" method="post">

2
proxy/pool_lista.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(10); $DIRITTI = diritti('Admin');
view_top(); view_top();
if (isset($_POST['tempo'])) { if (isset($_POST['tempo'])) {

7
proxy/proxy_gest.php
View File

@@ -1,12 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(1); $DIRITTI = diritti('Admin');
// _SERVER["HTTP_REFERER"]
// _SERVER["PHP_SELF"]
// _SERVER["REQUEST_URI"]
?> ?>
<html> <html>
<head> <head>

2
proxy/users_edit.php
View File

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

13
proxy/users_lista.php
View File

@@ -1,15 +1,15 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(1); $DIRITTI = diritti('Admin');
view_top(); view_top();
?> ?>
<table cellpadding="0" cellspacing="0" border="0" width="90%"> <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> <tr>
<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td> <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 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> </tr>
<?php <?php
$query = " SELECT $query = " SELECT
@@ -26,10 +26,9 @@ $query = " SELECT
"; ";
$res = mysql_query( $query, $DB_ID ); $res = mysql_query( $query, $DB_ID );
html_intestazione (array ("","","","","Utente","","Nome Completo","","Ultimo Accesso","","IP Associato",""));
while ($dato = mysql_fetch_array ( $res )) { while ($dato = mysql_fetch_array ( $res )) {
?> ?>
<tr> <tr>
<?php <?php
if ($dato['attivo']) { 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="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td class="colip"><?php print $dato['ip'] ?></td> <td class="colip"><?php print $dato['ip'] ?></td>
<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
</td> </td>
</tr> </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 <?php
} ?> } ?>

2
proxy/users_pwd.php
View File

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

2
routing/index.php
View File

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

2
routing/linee.php
View File

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

2
routing/modlinea.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(10); $DIRITTI = diritti('Admin');
view_top(); view_top();
$netmask = array( 30 => "/30 - 255.255.255.252", $netmask = array( 30 => "/30 - 255.255.255.252",

3
utenti/dettlogutenti.php
View File

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

2
utenti/index.php
View File

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

2
utenti/logutenti.php
View File

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

2
utenti/modutenti.php
View File

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

2
utenti/permessiutenti.php
View File

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

2
utenti/updatepermessi.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include_once ("../core/config.php"); include_once ("../core/config.php");
$UTENTE = login(); $UTENTE = login();
$DIRITTI = diritti(); $DIRITTI = diritti('Admin');
$user_id = $_GET['user_id']; $user_id = $_GET['user_id'];
$accesso = $_GET['accesso']; $accesso = $_GET['accesso'];