From baa406219f555218ebb76d24c8eb55a2fe22604d Mon Sep 17 00:00:00 2001
From: pessoles <none>
Date: Sat, 7 Jan 2006 20:31:16 +0100
Subject: [PATCH] On envoie un mail a l'usager de P2P

darcs-hash:20060107193116-6d78a-15060dd62c6c575bc509a0e77a5658d31cda1750.gz
---
 surveillance/deconnexion.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py
index 2f1a45b7..ec1a1df1 100755
--- a/surveillance/deconnexion.py
+++ b/surveillance/deconnexion.py
@@ -257,7 +257,7 @@ for elupload, eltype, elid in uploadeurs:
         corps = upload.message_soft % {'from':upload.expediteur, 'to':proprio.email(), 'upload':elupload, 'proprio':proprio.Nom()}
         corps = corps.encode('iso 8859-15')
         mail.sendmail(upload.expediteur,proprio.email(),corps)
-
+        
         # On envoie un mail à disconnect
         ################################
         if upload.disconnect_mail_soft :
@@ -410,7 +410,7 @@ requete = "SELECT ip_src,id_p2p,count(ip_src) FROM p2p WHERE %s AND date > times
 curseur.execute(requete)
 fraudeurs = curseur.fetchall()
 
-# Recuperation des infectes pour ne pas les reblacklister
+# Recuperation des fraudeurs pour ne pas les resanctionner
 requete = "SELECT ip_crans,protocole FROM avertis_p2p WHERE  date > timestamp 'now' - interval '1 day'"
 curseur.execute(requete)
 avertisp2p = curseur.fetchall()
@@ -435,16 +435,21 @@ for ip, id_p2p, nombre in fraudeurs :
     if p2p.disconnect_mail :
         corps = p2p.avertissement % { 'From': upload.expediteur, 'To': upload.expediteur, 'protocole': protocole, 'hostname':hostname}
         corps = corps.encode('iso 8859-15')
-        #mail.sendmail(upload.expediteur,upload.expediteur,corps)
+        mail.sendmail(upload.expediteur,upload.expediteur,corps)
     
     # 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 = corps.encode('iso 8859-15')
+    #mail.sendmail(upload.expediteur,proprio.email(),corps)
     
     # Blacklistage
-    # date = time()
-    # debut = localtime(date)
-    # 7 jours
-    # 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()
+    date = time()
+    debut = localtime(date)
+    #7 jours
+    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()