diff --git a/.gitignore b/.gitignore index 1e814ac..4ca6c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ proxy/script/conntrack.conf core/config.php squid_pool.log script/*.sql +squid_acl/listip diff --git a/core/function.php b/core/function.php index 7886077..4e3a4f7 100755 --- a/core/function.php +++ b/core/function.php @@ -338,13 +338,14 @@ function azioni ($tabella, $idtabella, $stato) { } } -function lista_moduli () { +function array_moduli () { global $UTENTE, $DB_ID, $CONF; $query = " SELECT moduli.id AS id, moduli.nome AS nome, - moduli.directory AS directory + moduli.directory AS directory, + moduli.descrizione AS descrizione FROM utenti JOIN @@ -357,14 +358,15 @@ function lista_moduli () { moduli.attivo = 1 "; - $menu[] = array("Home", $CONF['base_url']."/core/main.php",0); + $menu[] = array("Home", $CONF['base_url']."/core/main.php",0,"Home Page"); if ($UTENTE['admin']) { - $menu[] = array("Configurazione", $CONF['base_url']."/core/conf.php"); + $menu[] = array("Configurazione", $CONF['base_url']."/core/conf.php",0,"Modifica configurazione"); $query .= " UNION DISTINCT SELECT moduli.id AS id, moduli.nome AS nome, - moduli.directory AS directory + moduli.directory AS directory, + moduli.descrizione AS descrizione FROM moduli WHERE @@ -377,15 +379,44 @@ function lista_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']); + $menu[] = array($dato['nome'], $CONF['base_url']."/".$dato['directory']."/index.php",$dato['id'], $dato['descrizione']); } - $menu[] = array("Cambio password", $CONF['base_url']."/core/chkpasswd.php",0); + $menu[] = array("Cambio password", $CONF['base_url']."/core/chkpasswd.php",0,"Cambio Password"); + + return $menu; +} + +function home_moduli () { + global $UTENTE, $CONF; + + $menu = array_moduli(); +?> +




