diff --git a/.htaccess b/.htaccess index 96aa873..fdaaa92 100644 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,9 @@ RewriteEngine on RewriteRule ^(.*/)?img/(.*) risorse/immagini/$2 [L] RewriteRule ^(.*/)?css/(.*) risorse/stili/$2 [L] + +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule . /pannello_vbc/rewrite.php [L] + + diff --git a/DBDiff/proxy.sql b/DBDiff/proxy.sql new file mode 100644 index 0000000..7c9b832 --- /dev/null +++ b/DBDiff/proxy.sql @@ -0,0 +1,29 @@ +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`; + +CREATE TABLE `rewrite` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `from_url` varchar(512) NOT NULL, + `to_url` varchar(512) NOT NULL, + `attivo` tinyint(1) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `from_url` (`from_url`(255)) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 + +INSERT INTO `rewrite` (`id`, `from_url`, `to_url`, `attivo`) VALUES +(1, 'pannello_vbc/proxy_auth.php', 'proxy/ext/main_proxy.php', 1), +(2, 'pannello_vbc/main_proxy.php', 'proxy/ext/main_proxy.php', 1), +(3, 'pannello_vbc/logout_proxy.php', 'proxy/ext/logout_proxy.php', 1), +(4, 'pannello_vbc/chkpasswd_proxy.php', 'proxy/ext/chkpasswd_proxy.php', 1); + +ALTER TABLE `proxy_utenti` ADD `primo` DATETIME NULL AFTER `modifica`; +ALTER TABLE `proxy_utenti` ADD `ultimo` DATETIME NULL AFTER `ultimo`; +ALTER TABLE `proxy_utenti` ADD `tempo` DECIMAL(20,2) NOT NULL DEFAULT '0' AFTER `attivo`; +ALTER TABLE `proxy_utenti` CHANGE `ip` `ip` VARCHAR(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL; +REVOKE ALL PRIVILEGES ON `pannello_vbc`.`proxy_utenti` FROM 'pannello_proxy'@'%'; GRANT SELECT, UPDATE (`primo`, `ultimo`, `attivo`) ON `pannello_vbc`.`proxy_utenti` TO 'pannello_proxy'@'%'; + +INSERT INTO `pannello_vbc`.`moduli_page` (`id`, `id_moduli`, `nome`, `ordine`, `pagina`, `livello`, `attivo`) VALUES (NULL, '1', 'Lista Gruppi', '35', 'users_group_lista.php', '10', '1'); + +ALTER TABLE `moduli` ADD `ordine` INT NOT NULL AFTER `nome`; diff --git a/calendar.css b/OLD_REMOVE/calendar.css similarity index 100% rename from calendar.css rename to OLD_REMOVE/calendar.css diff --git a/chk.php b/OLD_REMOVE/chk.php similarity index 100% rename from chk.php rename to OLD_REMOVE/chk.php diff --git a/footer_mini.php b/OLD_REMOVE/footer_mini.php similarity index 100% rename from footer_mini.php rename to OLD_REMOVE/footer_mini.php diff --git a/gestfw.php b/OLD_REMOVE/gestfw.php similarity index 100% rename from gestfw.php rename to OLD_REMOVE/gestfw.php diff --git a/modrule.php b/OLD_REMOVE/modrule.php similarity index 100% rename from modrule.php rename to OLD_REMOVE/modrule.php diff --git a/rule.php b/OLD_REMOVE/rule.php similarity index 100% rename from rule.php rename to OLD_REMOVE/rule.php diff --git a/top_mini.php b/OLD_REMOVE/top_mini.php similarity index 100% rename from top_mini.php rename to OLD_REMOVE/top_mini.php diff --git a/TODO b/TODO index f7653c5..da0bcc1 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,6 @@ # Moduli da implementare -- Proxy +- Accesso Desktop - Firewall - DHCP - Routing - diff --git a/core/function.php b/core/function.php index 4e3a4f7..c5c269c 100755 --- a/core/function.php +++ b/core/function.php @@ -49,7 +49,7 @@ function db_data_connect () { function login () { global $_SESSION, $_POST, $POP3_Server, $DB_ID, $CONF; - session_name("FirewallSW"); + session_name("SWP"); session_start(); if ($_SESSION['auth'] && ($_SESSION['time']+$CONF['temposessione']*60 >= time())) { if(!db_login ($_SESSION['username'], $_SESSION['passwd'])) { @@ -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 @@ -356,12 +357,14 @@ function array_moduli () { utenti.utente = '".$_SESSION['username']."' AND moduli.attivo = 1 + ORDER BY + ordine "; - $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 +382,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"); @@ -391,13 +394,10 @@ function home_moduli () { global $UTENTE, $CONF; $menu = array_moduli(); -?> -




