diff --git a/.gitignore b/.gitignore
index 206bf07..1e814ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-proxy/conntrack.conf
+proxy/script/conntrack.conf
 core/config.php
 squid_pool.log
 script/*.sql
diff --git "a/proxy/\\" "b/proxy/\\"
new file mode 100644
index 0000000..7d21889
--- /dev/null
+++ "b/proxy/\\"
@@ -0,0 +1,87 @@
+<?php
+include_once ("../core/config.php");
+$UTENTE = login();
+$DIRITTI = diritti(1);
+view_top();
+
+if (isset($_GET['id'])) {
+	$id = $_GET['id'];
+} elsif (isset($_POST['id'])) {
+	$id = $_POST['id'];
+	$user = $_POST[''];
+	$fullname = $_POST[''];
+
+	$query = "	UPDATE
+				proxy_utenti
+			SET
+				user = '$user',
+				fullname = '$fulname',
+				modifica = NOW()
+			WHERE
+				id = $id	
+	";
+	$res = mysql_query( $query, $DB_ID );
+
+}
+?>
+
+
+<form name="" method="post">
+<input type="hidden" name="id" value="<?php print $id ?>">
+<table cellpadding="0" cellspacing="0" border="0" width="90%">
+<?php
+$query = "	SELECT 
+			id,
+			user,
+			fullname,
+			attivo,
+			DATE_FORMAT(data, '%d.%m.%Y %H:%i:%s') AS data,
+			DATE_FORMAT(modifica, '%d.%m.%Y %H:%i:%s') AS modifica,
+			ip
+		FROM
+			proxy_utenti
+		WHERE
+			id = $id
+	";
+
+$res = mysql_query( $query, $DB_ID );
+$dato = mysql_fetch_array ( $res );
+?>
+	<tr>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Utente</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Nome Completo</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Data attivazione</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Ultima Modifica</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">IP</td>
+	</tr>
+
+	<tr>
+<?php
+if ($dato['attivo']) {
+?>
+		<td class="col3btn"><a href="users_gest.php?azione=blocca&id=<?php print $dato['id']?>"><img border=0 src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente Attivo" TITLE="Utente Attivo"></a></td>
+<?php	} else { ?>
+		<td class="col3btn"><a href="users_gest.php?azione=abilita&id=<?php print $dato['id']?>"><img border=0 src="<?php print $CONF['base_url'] ?>/img/non_attivo.gif" ALT="Utente non Attivo" TITLE="Utente non Attivo"></a></td>
+<?php	} ?>
+		<td class="colip"><input type="text" size="16" name=id value="<?php print $dato['user'] ?>"></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><input type="text" size="32" name=fullname value="<?php print $dato['fullname'] ?>"></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['data'] ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['modifica'] ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><?php print $dato['ip'] ?></td>
+	</tr>
+	<tr><td class="spaziov" colspan=10><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=10><input type="submit" value="Vonferma"></td></tr>
+
+</table>
+</form>
+<img src="<?php print $CONF['base_url'] ?>/img/spazio.gif" width="1" height="20" alt="">
+<?php view_footer(); ?>
diff --git a/proxy/users_edit.php b/proxy/users_edit.php
index 57d6e53..9ab808b 100755
--- a/proxy/users_edit.php
+++ b/proxy/users_edit.php
@@ -4,20 +4,57 @@ $UTENTE = login();
 $DIRITTI = diritti(1);
 view_top();
 
-if (isset($_GET['id'])) {
-	$id = $_GET['id'];
-} else {
+if (isset($_POST['id'])) {
+	$id = $_POST['id'];
+	$user = $_POST['user'];
+	$fullname = $_POST['fullname'];
+	$ip = $_POST['ip'];
 
+	$pwd = "";
+
+	if ($_POST['pwd1'] != "") {
+		$pwd1 = $_POST['pwd1'];
+		$pwd2 = $_POST['pwd2'];
+
+		if ($pwd1 == $pwd2) {
+			$pwd = "pass = PASSWORD('$pwd1'),";
+		} else {
+			$pwd = -1;
+		}
+	}
+
+	if ($pwd == -1) {
+		print "ERRORE le password devono coincidere";
+	} else {
+		$query = "	UPDATE
+					proxy_utenti
+				SET
+					user = '$user',
+					fullname = '$fullname',
+					ip = '$ip',
+					$pwd
+					modifica = NOW()
+				WHERE
+					id = $id	
+		";
+		$res = mysql_query( $query, $DB_ID );
+	}
+} elseif (isset($_GET['id'])) {
+	$id = $_GET['id'];
 }
 ?>
-<table cellpadding="0" cellspacing="0" border="1" width="90%">
+
+<form name="" method="post">
+<input type="hidden" name="id" value="<?php print $id ?>">
+<table cellpadding="0" cellspacing="0" border="0" width="90%">
 <?php
 $query = "	SELECT 
 			id,
 			user,
 			fullname,
 			attivo,
-			data,
+			DATE_FORMAT(data, '%d.%m.%Y %H:%i:%s') AS data,
+			DATE_FORMAT(modifica, '%d.%m.%Y %H:%i:%s') AS modifica,
 			ip
 		FROM
 			proxy_utenti
@@ -26,41 +63,73 @@ $query = "	SELECT
 	";
 
 $res = mysql_query( $query, $DB_ID );
-while ($dato = mysql_fetch_array ( $res )) {
+$dato = mysql_fetch_array ( $res );
+
+$query = "	SELECT
+			ip
+		FROM
+			proxy_pool
+		";
+$res = mysql_query( $query, $DB_ID );
+
 ?>
+	<tr>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Utente</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Nome Completo</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Data attivazione</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Ultima Modifica</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">IP</td>
+	</tr>
 
 	<tr>
 <?php
-	if ($dato['attivo']) {
+if ($dato['attivo']) {
 ?>
 		<td class="col3btn"><a href="users_gest.php?azione=blocca&id=<?php print $dato['id']?>"><img border=0 src="<?php print $CONF['base_url'] ?>/img/attivo.gif" ALT="Utente Attivo" TITLE="Utente Attivo"></a></td>
 <?php	} else { ?>
 		<td class="col3btn"><a href="users_gest.php?azione=abilita&id=<?php print $dato['id']?>"><img border=0 src="<?php print $CONF['base_url'] ?>/img/non_attivo.gif" ALT="Utente non Attivo" TITLE="Utente non Attivo"></a></td>
 <?php	} ?>
-
-
-
-
-
-
-
-		<td class="colip"><?php print $dato['user'] ?></td>
-
+		<td class="colip"><input type="text" size="16" name=user value="<?php print $dato['user'] ?>"></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
-		<td class="colip"><?php print $dato['fullname'] ?></td>
-
+		<td class="colip"><input type="text" size="32" name=fullname value="<?php print $dato['fullname'] ?>"></td>
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td class="colip"><?php print $dato['data'] ?></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['modifica'] ?></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">
+			<select name="ip">
+				<option value="" <?php if ($dato['ip'] == "") { print "selected=\"selected\"";}?>>Nessuno</option>
+<?php	while ($dato_ip = mysql_fetch_array ( $res )) { ?>
+				<option value="<?php print $dato_ip['ip']?>" <?php if ($dato['ip'] == $dato_ip['ip']) { print "selected=\"selected\"";}?>><?php print $dato_ip['ip']?></option>
+<?php	} ?>
+			</select>
 		</td>
 	</tr>
-	<tr><td class="spaziov" colspan=13><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=10><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Nuova Password</td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip">Conferma Nuova Password</td>
+		<td colspan="7" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+	</tr>
+	<tr>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><input type="password" size="16" name=pwd1></td>
+		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+		<td class="colip"><input type="password" size="16" name=pwd2></td>
+		<td colspan="7" class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
+	</tr>
+	<tr><td class="spaziov" colspan=10><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
+	<tr><td class="spaziov" colspan=10><input type="submit" value="Conferma"></td></tr>
 
-<?php
-} ?>
 </table>
+</form>
 <img src="<?php print $CONF['base_url'] ?>/img/spazio.gif" width="1" height="20" alt="">
 <?php view_footer(); ?>
diff --git a/proxy/users_lista.php b/proxy/users_lista.php
index 6a66186..6419c7c 100755
--- a/proxy/users_lista.php
+++ b/proxy/users_lista.php
@@ -12,7 +12,7 @@ $query = "	SELECT
 			user,
 			fullname,
 			attivo,
-			data,
+			DATE_FORMAT(data, '%d.%m.%Y %H:%i:%s') AS data,
 			ip
 		FROM
 			proxy_utenti
diff --git a/script/partitioning.pl b/script/partitioning.pl
index 606383b..742f65d 100755
--- a/script/partitioning.pl
+++ b/script/partitioning.pl
@@ -136,6 +136,15 @@ sub aggiorna {
 
 	}
 
+	printf  "Inizio attivita' pulizia %s\n",strftime('%d-%m-%Y %H:%M:%S',localtime) if ($messaggi);
+		$query = "	DELETE FROM 
+					proxy_dati 
+				WHERE 
+					data_new < DATE_SUB(NOW(), INTERVAL 1 DAY) 
+				AND 
+					data_destroy = '1970-01-01 00:00:00';
+		";
+
 
 	printf  "Termine attivita' %s\n",strftime('%d-%m-%Y %H:%M:%S',localtime) if ($messaggi);
 }