From d9737a965ace791f6d5a6695191681bb8903f2c2 Mon Sep 17 00:00:00 2001 From: chove Date: Thu, 3 Nov 2005 14:35:58 +0100 Subject: [PATCH] prise en compte de la variable p2p.disconnect_mail darcs-hash:20051103133558-4ec08-710c31e878be0638ae4bfb22006c571cc5cdc654.gz --- surveillance/deconnexion.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index 1e38e177..01de3d37 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -339,9 +339,10 @@ for ip, id_p2p, nombre in fraudeurs : # proprio = machine.proprietaire() # Envoie du mail à disconnect - 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) + 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) # Inscription dans la base des avertis requete="INSERT INTO avertis_p2p (ip_crans,date,protocole) VALUES ('%s','now','%s')" % (ip, protocole)