From 53a33c5a8606ef1b525e2ae4b3d4396587236b19 Mon Sep 17 00:00:00 2001
From: chove <none>
Date: Sun, 8 Jan 2006 20:49:06 +0100
Subject: [PATCH] petites corrections

darcs-hash:20060108194906-4ec08-84dc9c4894d720c7785936d85efedb26e13b9f72.gz
---
 surveillance/deconnexion.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py
index 5650b90b..24f7ad6e 100755
--- a/surveillance/deconnexion.py
+++ b/surveillance/deconnexion.py
@@ -429,7 +429,7 @@ for ip, id_p2p, nombre in fraudeurs :
     # Recuperation des ref de la machine
     machine = ldap.search('ipHostNumber=%s' % ip,'w' )['machine'][0]
     hostname = machine.nom()
-    # proprio = machine.proprietaire()    
+    proprio = machine.proprietaire()    
 
     # Envoie du mail à disconnect
     if p2p.disconnect_mail :
@@ -440,16 +440,17 @@ for ip, id_p2p, nombre in fraudeurs :
     # inscription dans la base des avertis
     requete="INSERT INTO avertis_p2p (ip_crans,date,protocole) VALUES ('%s','now','%s')" % (ip, protocole)
     curseur.execute(requete)
+    
     # On envoie un mail a l'adhérent
     ################################
-    corps = p2p.avertissement % {'from':upload.expediteur, 'to':proprio.email(), 'upload':elupload, 'proprio':proprio.Nom()}
+    corps = p2p.avertissement % {'From':upload.expediteur, 'To':proprio.email(), 'protocole': protocole, 'hostname':hostname}
     corps = corps.encode('iso 8859-15')
     mail.sendmail(upload.expediteur,proprio.email(),corps)
     
     # Blacklistage
-    date = time()
-    debut = localtime(date)
+    #date = time()
+    #debut = localtime(date)
     #7 jours
-    fin = localtime(date+60*60*24*7)
+    #fin = localtime(date+60*60*24*7)
     #proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),"%d/%d/%d %d:%d" % (fin[2],fin[1],fin[0],fin[3],fin[4]),'p2p',"P2P (auto)" % protocole])
     #proprio.save()