crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deconnexion.py] passage en utf-8

Browse source 
darcs-hash:20090319122121-bd074-d8380ffbaca92867e3e79ffc843cea20d71739ec.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-03-19 13:21:21 +01:00
parent 4577de7bbc
commit 3c25335710
1 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
surveillance/deconnexion.py
View file

@ -195,14 +195,14 @@ for elupload, eltype, elid in uploadeurs:
# On envoie un mail à l'adhérent # On envoie un mail à l'adhérent
################################ ################################
corps = upload.message_hard % {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom()} corps = upload.message_hard % {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom()}
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, proprio.email(), corps) mail.sendmail(upload.expediteur, proprio.email(), corps)
# On envoie un mail à disconnect # On envoie un mail à disconnect
################################ ################################
if upload.disconnect_mail_hard: if upload.disconnect_mail_hard:
corps = upload.message_disconnect_hard % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': elupload, 'proprio': proprio.Nom()} corps = upload.message_disconnect_hard % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': elupload, 'proprio': proprio.Nom()}
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, upload.expediteur, corps) mail.sendmail(upload.expediteur, upload.expediteur, corps)
# Vérification du nombre de déconnexions # Vérification du nombre de déconnexions
@ -215,7 +215,7 @@ for elupload, eltype, elid in uploadeurs:
# Envoi du mail à disconnect # Envoi du mail à disconnect
corps = upload.message_disconnect_multi % {'from': upload.expediteur, 'to': upload.expediteur, 'nbdeco': nb_decos, 'proprio': proprio.Nom(), 'ps': fichier_ps} corps = upload.message_disconnect_multi % {'from': upload.expediteur, 'to': upload.expediteur, 'nbdeco': nb_decos, 'proprio': proprio.Nom(), 'ps': fichier_ps}
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, upload.expediteur, corps) mail.sendmail(upload.expediteur, upload.expediteur, corps)
elif elupload >= upload.soft: elif elupload >= upload.soft:
@ -245,14 +245,14 @@ for elupload, eltype, elid in uploadeurs:
# On envoie un mail à l'adhérent # On envoie un mail à l'adhérent
################################ ################################
corps = upload.message_soft % {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom()} corps = upload.message_soft % {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom()}
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, proprio.email(), corps) mail.sendmail(upload.expediteur, proprio.email(), corps)
# On envoie un mail à disconnect # On envoie un mail à disconnect
################################ ################################
if upload.disconnect_mail_soft: if upload.disconnect_mail_soft:
corps = upload.message_disconnect_soft % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': elupload, 'proprio': proprio.Nom()} corps = upload.message_disconnect_soft % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': elupload, 'proprio': proprio.Nom()}
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, upload.expediteur, corps) mail.sendmail(upload.expediteur, upload.expediteur, corps)
# On supprime les vieux avertisements # On supprime les vieux avertisements
@ -451,7 +451,7 @@ for ip, id_p2p, nombre in fraudeurs:
'hostname': hostname, 'hostname': hostname,
'nb_paquets': nombre, 'nb_paquets': nombre,
'datedebut': date } 'datedebut': date }
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, upload.expediteur, corps) mail.sendmail(upload.expediteur, upload.expediteur, corps)
# Inscription dans la base des avertis # Inscription dans la base des avertis
@ -464,7 +464,7 @@ for ip, id_p2p, nombre in fraudeurs:
'To': proprio.email(), 'To': proprio.email(),
'protocole': protocole, 'protocole': protocole,
'hostname': hostname } 'hostname': hostname }
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(p2p.expediteur, proprio.email(), corps) mail.sendmail(p2p.expediteur, proprio.email(), corps)
# Vérification du nombre de déconnexions # Vérification du nombre de déconnexions
@ -479,7 +479,7 @@ for ip, id_p2p, nombre in fraudeurs:
'nbdeco': nb_decos, 'nbdeco': nb_decos,
'proprio':proprio.Nom(), 'proprio':proprio.Nom(),
'ps': fichier_ps } 'ps': fichier_ps }
corps = corps.encode('iso 8859-15') corps = corps.encode('utf-8')
mail.sendmail(p2p.expediteur, p2p.expediteur, corps) mail.sendmail(p2p.expediteur, p2p.expediteur, corps)
# L'adhérent n'est pas encore blacklisté # L'adhérent n'est pas encore blacklisté