diff --git a/cluster.php b/cluster.php
index 5190dd9..f83e200 100755
--- a/cluster.php
+++ b/cluster.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/conf.php b/conf.php
index 88a6238..8848ec5 100755
--- a/conf.php
+++ b/conf.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/php/auth.php b/core/auth.php
similarity index 100%
rename from php/auth.php
rename to core/auth.php
diff --git a/core/config.php b/core/config.php
new file mode 100755
index 0000000..2cb8914
--- /dev/null
+++ b/core/config.php
@@ -0,0 +1,13 @@
+<?php
+$aggiornamento = "02.03.2012";
+$versione = "0.2";
+
+$db_data_server = "127.0.0.1";
+$db_data_name = "pannello_vbc";
+$db_data_user = "pannello";
+$db_data_pwd = "Lx7w3e8dNPfwwc3z";
+
+require_once ("function.php");
+$DB_ID = db_data_connect ();
+carica_conf();
+?>
diff --git a/core/function.php b/core/function.php
new file mode 100755
index 0000000..5ac792c
--- /dev/null
+++ b/core/function.php
@@ -0,0 +1,331 @@
+<?php
+function escape_string ($string)
+{
+    if(is_array($string)) {
+        $clean = array();
+        foreach(array_keys($string) as $row) {
+            $clean[$row] = escape_string($string[$row]);
+        }
+        return $clean;
+    }
+    if (get_magic_quotes_gpc ())
+    {
+        $string = stripslashes($string);
+    }
+    if (!is_numeric($string))
+    {
+        $link = db_auth_connect();
+        $escaped_string = mysql_real_escape_string($string, $link);
+    }
+    else
+    {
+        $escaped_string = $string;
+    }
+    return $escaped_string;
+}
+
+function pop3_login($host,$user,$pass,$port=110,$folder="INBOX",$ssl=false)
+{
+    $ssl=($ssl==false)?"/novalidate-cert":"";
+    $ritorno =  (imap_open("{"."$host:$port/pop3$ssl"."}$folder",$user,$pass));
+    return $ritorno;
+}
+
+function db_login($user,$pass) {
+	global $DB_ID;
+	$query = "SELECT id FROM utenti WHERE utente ='$user' AND password = MD5('$pass') AND attivo = 1";
+	$res = mysql_query( $query, $DB_ID );
+	$dato = mysql_fetch_array ( $res );
+	$ritorno = $dato['id'];
+	return $ritorno;
+}
+
+function db_data_connect () {
+	global $db_data_server, $db_data_user, $db_data_pwd, $db_data_name;
+	$db_data_id = mysql_connect($db_data_server, $db_data_user, $db_data_pwd);
+	mysql_select_db($db_data_name, $db_data_id);
+	return $db_data_id;
+}
+
+function login () {
+	global $_SESSION, $_POST, $POP3_Server, $DB_ID, $CONF;
+	session_name("FirewallSW");
+	session_start();
+	if ($_SESSION['auth'] && ($_SESSION['time']+$CONF['temposessione']*60 >= time())) {
+		if(!db_login ($_SESSION['username'], $_SESSION['passwd'])) {
+			$tMessage = '<span class="error_msg">Dati di autenticazione errati</span>';
+			$tUsername = $_SESSION['username'];
+			$_SESSION['auth'] = 0;
+			session_destroy();
+			include ("userlogin.php");
+			exit;
+		} else {
+			logga ($_SERVER['REQUEST_URI']);
+			$_SESSION['time'] = time();
+			return carica_utente ();
+		}
+	} else {
+		if ($_POST['fUsername']) {
+			$fUsername = $_POST['fUsername'];
+	   		$fPassword = $_POST['fPassword'];
+	   		if(db_login ($fUsername, $fPassword)) {
+			print "-- ".$_POST['fUsername']." - ".$_POST['fPassword']." --<br>";
+		      		$_SESSION = array();
+		      		$_SESSION['passwd'] = $fPassword;
+		      		$_SESSION['username'] = $fUsername;
+		      		$_SESSION['auth'] = 1;
+      				$_SESSION['time'] = time();
+				session_regenerate_id(TRUE);
+      				logga ("Accesso");
+      				return carica_utente ();
+   			} else {
+   				$tMessage = 'Errore';
+        		 	$tUsername = $fUsername;
+				include ("userlogin.php");
+        		 	exit;
+   			}
+		} else {
+			if ($_SESSION['auth'] && ($_SESSION['time']+$CONF['temposessione']*60 < time())) {
+				$tMessage = '<span class="error_msg">Sessione scaduta</span>';
+				$tUsername = $_SESSION['username'];
+				logga ("Sessione scaduta");
+				include ("userlogin.php");
+       			  	exit;
+			} else {
+				include ("userlogin.php");
+       			  	exit;
+			}
+		}
+	}
+}
+
+function carica_conf () {
+	global $CONF, $DB_ID;
+	$query = "SELECT variabile, valore FROM conf";
+	$res = mysql_query( $query, $DB_ID );
+	while ($dato = mysql_fetch_array ( $res )) {
+		$CONF[$dato[0]] = $dato[1];
+	}
+}
+
+function isadmin () {
+	global $UTENTE;
+	if ($UTENTE['admin']) {
+		return;
+	} else {
+		header("location: main.php");
+		exit;
+	}
+}
+
+function carica_utente () {
+	global $_SESSION, $CONF, $DB_ID;
+	$query = "SELECT * FROM utenti where utente = '".$_SESSION['username']."'";
+	$res = mysql_query( $query, $DB_ID );
+	$dati = mysql_fetch_array ( $res );
+
+	return $dati;
+}
+
+function is_first_access () {
+	global $_SESSION, $DB_ID, $CONF;
+	$utente = $_SESSION['username'];
+	$query = "SELECT * FROM utenti WHERE utente = '$utente'";
+	$res = mysql_query( $query, $DB_ID );
+	if (!mysql_fetch_array( $res )) {
+		$query = "INSERT INTO utenti SET utente='$utente', max_perm='".$CONF['permanenti']."', max_temp='".$CONF['temporanei']."', creato=now(), max_tempo='".$CONF['tempo_temporanei']."', totale=".$CONF['totale'].", idtemplate=".$CONF['template_base'];
+		mysql_query( $query, $DB_ID );
+		logga ("Creazione nuova utenza");
+		mkdir ($CONF['storage'].'/'.$utente);
+		logga ("Creazione storage utente");
+	}
+}
+
+function logga ($testo, $dest="") {
+	global $_SESSION, $DB_ID, $CONF;
+	
+	if ($dest == "") {
+		$destinatario = $_SESSION['username'];
+	} else {
+		$destinatario = $dest;
+	}	
+	
+	$ip = @$_SERVER["REMOTE_ADDR"];
+	$sessione = session_id();;
+//	print "-- $sessione --";
+	$query = "INSERT INTO accessi_utenti SET utente = '$destinatario', quando = now(), ip = '$ip', cosa = '$testo', sessione = '$sessione'";
+	$queryuser = "UPDATE utenti SET ultimo = now() WHERE utente = '$destinatario'";
+//	print "-- $queryuser --";
+	$res = mysql_query( $query, $DB_ID );	
+	$res = mysql_query( $queryuser, $DB_ID );	
+}
+
+function logga_allegati ($id, $cosa) {
+	global $DB_ID, $CONF;
+	$ip = $_SERVER["REMOTE_ADDR"];
+	$query = "INSERT INTO accesso_allegati SET idallegato=$id, quando=now(), cosa='$cosa', ip='$ip'";
+	$res = mysql_query( $query, $DB_ID );
+}
+
+function ultimo_coll () {
+	global $_SESSION, $DB_ID, $CONF;
+	$query = "SELECT DATE_FORMAT(quando, '%d-%m-%Y %H:%i:%s') as quando FROM accessi_utenti WHERE utente = '".$_SESSION['username']."' AND cosa = 'Uscita' order by quando desc limit 1";
+	$res = mysql_query( $query, $DB_ID );
+	$dato = mysql_fetch_array ( $res );
+	if (is_null($dato['quando'])) {
+		return "Primo accesso";
+	} else {
+		return $dato['quando'];
+	}
+}
+
+function codice(){
+	global $DB_ID;
+	$N_Caratteri = 30;
+	$Stringa = "";
+	For($I=0;$I<$N_Caratteri;$I++){
+		do{
+			$N = Ceil(rand(48,122));
+		}while(!((($N >= 48) && ($N <= 57)) || (($N >= 65) && ($N <= 90)) || (($N >= 97) && ($N <= 122))));
+		$Stringa = $Stringa.Chr ($N);
+	}
+	
+	$query = "SELECT * FROM allegati WHERE codice='$Stringa' AND vecchio=0";
+	$res = mysql_query( $query, $DB_ID );
+	if (mysql_fetch_array ( $res )) { $stringa = codice(); }
+	return $Stringa;
+}
+
+function invia_mail ($oggetto, $testo, $dest="") {
+	global $UTENTE, $CONF;
+	
+	$headers = 'From: noreply@esseweb.eu' . "\r\n" .
+    'X-Mailer: PHP/' . phpversion();	
+	
+	if ($dest == "") {
+		$destinatario = $UTENTE['utente'];
+	} else {
+		$destinatario = $dest;
+	}
+	mail($destinatario, $oggetto, $testo, $headers);
+}
+
+function fsize ($stat) {
+	$stat = (float)$stat;
+	$idx = 0;
+	$arr = array("B","kB","MB","GB","TB","PB","EB","ZB","YB");
+	while(floor($stat/1024)>0){
+		$stat = round($stat/1024,2);
+		$idx++;
+	}
+	return $stat." ".$arr[$idx];
+}
+
+function creanome ($idparent) {
+	global $DB_ID;
+	$query = "SELECT interfacce.device, defrule.idparent, defrule.priorita FROM defrule JOIN interfacce ON defrule.idinterfacce = interfacce.id WHERE defrule.id = '$idparent'";
+	$res = mysql_query( $query, $DB_ID );
+	$dato = mysql_fetch_array ( $res );
+	if ($dato['idparent'] == 0) {
+		$ritorno = $dato['device']."-2:".$dato['priorita'];
+		return $ritorno;
+	} else {
+		$ritorno = creanome($dato['idparent']).":".$dato['priorita'];
+		return $ritorno;
+	}
+}
+
+function defrule_att ($id) {
+	global $DB_ID;
+	$query = "UPDATE defrule SET attivo=1, stato=2 WHERE id = $id";
+	if (mysql_query( $query, $DB_ID )) {
+		azioni ("defrule", $id, 1);
+		$query = "SELECT idparent FROM defrule WHERE id = $id";
+		$res = mysql_query( $query, $DB_ID );
+		$dato = mysql_fetch_array ( $res );
+		$parent = $dato['idparent'];
+		if ($parent) {
+			$ritorno = defrule_att($parent);
+		} else {
+			$ritorno = 1;	
+		}
+	} else {
+		return mysql_error();
+	}
+	return $ritorno;
+}
+
+function defrule_dis ($id, $stato=2) {
+	global $DB_ID;
+	$ritorno = 1;
+	$query = "UPDATE defrule SET attivo=0, stato=$stato WHERE id = $id";
+	if (mysql_query( $query, $DB_ID )) {
+		azioni ("defrule", $id, 3);
+		if ($stato == 3) {
+			$query_rule = "DELETE FROM rule WHERE iddefrule = $id";
+			mysql_query( $query_rule, $DB_ID );
+		}
+		$query = "SELECT id FROM defrule WHERE idparent = $id AND stato <> 3";
+		if ($res = mysql_query( $query, $DB_ID )) {
+			while ($dato = mysql_fetch_array ($res)) {
+				$ritorno = defrule_dis ($dato['id'], $stato);
+			}
+		} else {
+			return mysql_error();
+		}
+	} else {
+		return mysql_error();
+	}
+	return $ritorno;	
+}
+
+function defrule_reset ($iddevice, $idparent, $fw) {
+	global $DB_ID;
+	$query = "SELECT id FROM defrule WHERE idinterfacce = $iddevice AND idparent = $idparent AND attivo = 1 AND stato <> 3";
+	$res = mysql_query( $query, $DB_ID );
+	while ($dato = mysql_fetch_array ($res)) {
+		$id_defrule = $dato['id'];
+		$query_azioni = "INSERT INTO azioni SET fw=$fw, tabella='defrule', idtabella=$id_defrule, stato=1, datains=NOW()";
+		mysql_query( $query_azioni, $DB_ID );
+		defrule_reset ($iddevice, $id_defrule, $fw);
+	}
+}
+
+function maxrate ($idrule, $idparent, $device) {
+	global $DB_ID;
+	if ($idparent == 0) {
+		$querylim = "SELECT rate, ceil FROM interfacce WHERE id = $device";
+	} else {
+		$querylim = "SELECT rate, ceil FROM defrule WHERE id = $idparent";
+	}
+	$queryatt = "SELECT SUM(rate) AS somma FROM defrule WHERE idinterfacce = $device AND attivo = 1 AND stato <> 3 AND id <> $idrule AND idparent = $idparent";
+	$querypri = "SELECT MAX(priorita) AS pri FROM defrule WHERE idinterfacce = $device AND stato <> 3 AND id <> $idrule AND idparent = $idparent AND priorita < 1000";
+
+	$reslim = mysql_query( $querylim, $DB_ID );
+	$datolim = mysql_fetch_array ($reslim);
+	$resatt = mysql_query( $queryatt, $DB_ID );
+	$datoatt = mysql_fetch_array ($resatt);
+	$respri = mysql_query( $querypri, $DB_ID );
+	$datopri = mysql_fetch_array ($respri);
+
+	$ritorno['rate'] = $datolim['rate'] - $datoatt['somma'];
+	$ritorno['ceil'] = $datolim['ceil'];
+	$ritorno['pri'] = $datopri['pri'] + 10;
+
+	return $ritorno;
+}
+
+function azioni ($tabella, $idtabella, $stato) {
+	global $DB_ID;
+
+	$query_fw = "SELECT id FROM firewall WHERE attivo = 1";
+	$res_fw = mysql_query( $query_fw, $DB_ID );
+	while ($dato_fw = mysql_fetch_array ($res_fw)) {
+		$id_fw = $dato_fw['id'];
+		$query_new = "INSERT INTO azioni SET fw = $id_fw, tabella = '$tabella', idtabella = $idtabella, stato = $stato, datains = NOW()";
+//		print "$query_new<br>";
+		mysql_query( $query_new, $DB_ID );
+	}
+}
+
+?>
diff --git a/php/pulisci.php b/core/pulisci.php
similarity index 100%
rename from php/pulisci.php
rename to core/pulisci.php
diff --git a/core/userlogin.php b/core/userlogin.php
new file mode 100755
index 0000000..08c1036
--- /dev/null
+++ b/core/userlogin.php
@@ -0,0 +1,23 @@
+<?php include_once ("top.php"); ?>
+<form name="login" method="post">
+<table cellpadding="0" cellspacing="10" border="0"  id="login_table">
+   <tr align="center" valign="middle">
+      <td colspan="2"><h4><?php print "Benvenuto" ?></h4></td>
+   </tr>
+   <tr>
+      <td><?php print "Utente:"; ?></td>
+      <td><input type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
+   </tr>
+   <tr>
+      <td><?php print "Password:"; ?></td>
+      <td><input type="password" name="fPassword" /></td>
+   </tr>
+   <tr>
+      <td colspan="2" align="center"><input type="submit" name="submit" value="<?php print "Accedi"; ?>" /></td>
+   </tr>
+   <tr>
+      <td colspan="2" align="center"<?php print $tMessage; ?></td>
+   </tr>
+</table>
+</form>
+<?php include_once ("footer.php"); ?>
diff --git a/defrule.php b/defrule.php
index 78a0d7e..113e207 100755
--- a/defrule.php
+++ b/defrule.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 ?>
diff --git a/dettlogutenti.php b/dettlogutenti.php
index f990d93..abc3dfd 100755
--- a/dettlogutenti.php
+++ b/dettlogutenti.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/device.php b/device.php
index 7366551..b64d57c 100755
--- a/device.php
+++ b/device.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/gestdevice.php b/gestdevice.php
index 39ef214..51c5016 100644
--- a/gestdevice.php
+++ b/gestdevice.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/gestfw.php b/gestfw.php
index 6bdac82..73703cc 100644
--- a/gestfw.php
+++ b/gestfw.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/grafico.php b/grafico.php
index 419d3c1..8e98099 100644
--- a/grafico.php
+++ b/grafico.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 
diff --git a/graph.php b/graph.php
index 9199009..48a344d 100644
--- a/graph.php
+++ b/graph.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 
diff --git a/graph.php.old b/graph.php.old
index a8643a3..9a3e712 100644
--- a/graph.php.old
+++ b/graph.php.old
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 
diff --git a/index.php b/index.php
index 90552b4..9ef717a 100755
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE=login();
 if ($UTENTE['admin']) {
 	header("Location: main.php");
diff --git a/logout.php b/logout.php
index 0bfc3c5..8c7e5c5 100755
--- a/logout.php
+++ b/logout.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 login();
 logga ("Uscita");
 session_name("AllegatiSW");
diff --git a/logutenti.php b/logutenti.php
index cb067b5..a963521 100755
--- a/logutenti.php
+++ b/logutenti.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/main.php b/main.php
index 43718dc..4ad446f 100755
--- a/main.php
+++ b/main.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/mainuser.php b/mainuser.php
index fd64f4c..468dfe8 100755
--- a/mainuser.php
+++ b/mainuser.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 ?>
diff --git a/modcluster.php b/modcluster.php
index 0fa11d1..eb35679 100755
--- a/modcluster.php
+++ b/modcluster.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/modconf.php b/modconf.php
index 488ebb1..d289e71 100755
--- a/modconf.php
+++ b/modconf.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/moddefrule.php b/moddefrule.php
index 4aa1f97..ec37d3b 100755
--- a/moddefrule.php
+++ b/moddefrule.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 ?>
diff --git a/moddevice.php b/moddevice.php
index 3a2659c..a10a4e7 100755
--- a/moddevice.php
+++ b/moddevice.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/modrule.php b/modrule.php
index 11b1eef..8936c90 100644
--- a/modrule.php
+++ b/modrule.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 
diff --git a/modutenti.php b/modutenti.php
index cfc4698..054c0b8 100755
--- a/modutenti.php
+++ b/modutenti.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/paginavuota.php b/paginavuota.php
index 5f062b9..da3a3f9 100755
--- a/paginavuota.php
+++ b/paginavuota.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/permessiutenti.php b/permessiutenti.php
index 2e9f24f..e460163 100755
--- a/permessiutenti.php
+++ b/permessiutenti.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>
diff --git a/php/.htaccess b/php.deleteme/.htaccess
similarity index 100%
rename from php/.htaccess
rename to php.deleteme/.htaccess
diff --git a/php.deleteme/auth.php b/php.deleteme/auth.php
new file mode 100755
index 0000000..0acfb4a
--- /dev/null
+++ b/php.deleteme/auth.php
@@ -0,0 +1,21 @@
+<?php
+
+
+if ($_SERVER['REQUEST_METHOD'] == "POST") {
+   $fUsername = escape_string ($_POST['fUsername']);
+   $fPassword = escape_string ($_POST['fPassword']);
+
+   if(autentica($_POST['fUsername'], $_POST['fPassword'])) {
+      session_start();
+      $_SESSION['sessid']['passwd'] = $fPassword;
+      $_SESSION['sessid']['username'] = $fUsername;
+   }
+   else {
+         $error = 1;
+         $tMessage = '<span class="error_msg">Errore</span>';
+         $tUsername = $fUsername;
+         include ("userlogin.php");
+         exit;
+   }
+}
+?>
diff --git a/php/config.php b/php.deleteme/config.php
similarity index 100%
rename from php/config.php
rename to php.deleteme/config.php
diff --git a/php/function.php b/php.deleteme/function.php
similarity index 100%
rename from php/function.php
rename to php.deleteme/function.php
diff --git a/php.deleteme/pulisci.php b/php.deleteme/pulisci.php
new file mode 100755
index 0000000..fd656a3
--- /dev/null
+++ b/php.deleteme/pulisci.php
@@ -0,0 +1,14 @@
+<?php
+include_once ("config.php");
+$query = "SELECT * FROM allegati WHERE scadenza < now() AND vecchio=0 AND permanente=0 UNION SELECT allegati.* FROM allegati JOIN accesso_allegati ON allegati.id = accesso_allegati.idallegato WHERE allegati.vecchio=0 AND allegati.autocancella=1 AND accesso_allegati.quando < subtime(now(),'12:0:0.0')";
+$res = mysql_query( $query, $DB_ID );
+
+while ($dato = @mysql_fetch_array ( $res )) {
+	print "Rimosso file ".$dato['nomefile']." di proprieta' dell'utente ".$dato['utente']."\n";
+	unlink ($dato['storage']);
+	$query = "UPDATE allegati SET vecchio=1, scadenza=now() WHERE id=".$dato['id'];
+	$res = mysql_query( $query, $DB_ID );
+	invia_mail ("Eliminazione allegato ".$dato['nomefile'], "In data ".date("Y-m-d H:i:s")." e' stato eliminato il file ".$dato['nomefile'], $dato['utente']);
+	logga ("Eliminato allegato ".$dato['codice']." per scadenza", $dato['utente']);
+}
+?>
\ No newline at end of file
diff --git a/php/userlogin.php b/php.deleteme/userlogin.php
similarity index 100%
rename from php/userlogin.php
rename to php.deleteme/userlogin.php
diff --git a/rule.php b/rule.php
index 78bd117..3ee86da 100755
--- a/rule.php
+++ b/rule.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 //isadmin();
 
diff --git a/script/check_traffico.pl b/script/check_traffico.pl
index 0dd6b64..604642e 100755
--- a/script/check_traffico.pl
+++ b/script/check_traffico.pl
@@ -17,7 +17,7 @@ while( $_ = shift @ARGV ) {
         $force	= 1	if /^\-f$/;
 }
 
-open CONFFILE, "< $Bin/../php/config.php" or die ("Manca file di configurazione\n");
+open CONFFILE, "< $Bin/../core/config.php" or die ("Manca file di configurazione\n");
 while (<CONFFILE>) {
 	if(/^\$db_data_server = "(\S+)"/ ) {
 		$db_host = $1;
diff --git a/script/partitioning.pl b/script/partitioning.pl
index ddc6a6e..396044d 100755
--- a/script/partitioning.pl
+++ b/script/partitioning.pl
@@ -12,7 +12,7 @@ while( $_ = shift @ARGV ) {
 	$messaggi	= 1	if /^\-v$/;
 }
 
-open CONFFILE, "< $Bin/../php/config.php" or die ("Manca file di configurazione\n");
+open CONFFILE, "< $Bin/../core/config.php" or die ("Manca file di configurazione\n");
 while (<CONFFILE>) {
         if(/^\$db_data_server = "(\S+)"/ ) {
                 $db_host = $1;
diff --git a/updatepermessi.php b/updatepermessi.php
index e681536..3965410 100755
--- a/updatepermessi.php
+++ b/updatepermessi.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 
diff --git a/usermodutenti.php b/usermodutenti.php
index 36b1f6b..8ba14c5 100755
--- a/usermodutenti.php
+++ b/usermodutenti.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 ?>
 <?php include_once ("top.php"); ?>
diff --git a/utenti.php b/utenti.php
index 41ae93c..6dcb622 100755
--- a/utenti.php
+++ b/utenti.php
@@ -1,5 +1,5 @@
 <?php
-include_once ("php/config.php");
+include_once ("core/config.php");
 $UTENTE = login();
 isadmin();
 ?>