From 246cba6107974598f709f9588486d30f625b1480 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Thu, 22 Oct 2015 23:13:42 +0200
Subject: [PATCH] deconnexion: utilise send_template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ce qui évite d'envoyer des mails à None.
---
 surveillance/deconnexion2.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/surveillance/deconnexion2.py b/surveillance/deconnexion2.py
index 195a77f1..4aa77bd6 100755
--- a/surveillance/deconnexion2.py
+++ b/surveillance/deconnexion2.py
@@ -301,18 +301,17 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
     # On envoie un mail à disconnect
     ################################
     with mail_module.ServerConnection() as smtp_conn:
-        corps = mail_module.generate('upload_hard', mail_data).as_string()
         if not DEBUG:
-            smtp_conn.sendmail(upload.expediteur, unicode(proprio.get_mail()), corps)
+            smtp_conn.send_template('upload_hard', mail_data)
         else:
-            print corps
+            print mail_module.generate('upload_hard', mail_data).as_string()
 
+        # Et on s'envoie un mail de notif
         mail_data['to'] = upload.expediteur
-        corps = mail_module.generate('upload_notif', mail_data).as_string()
         if not DEBUG:
-            smtp_conn.sendmail(upload.expediteur, upload.expediteur, corps)
+            smtp_conn.send_template('upload_notif', mail_data)
         else:
-            print corps
+            print mail_module.generate('upload_notif', mail_data).as_string()
 
 def upload_soft(proprio, elupload, elid, eltype, curseur):
     """Envoit un mail et stocke l'info"""
@@ -324,7 +323,7 @@ def upload_soft(proprio, elupload, elid, eltype, curseur):
     # On envoie un mail à l'adhérent
     ################################
     with mail_module.ServerConnection() as smtp_connect:
-        corps = mail_module.generate('upload_soft', {
+        mail_data = {
             'from': upload.expediteur,
             'to': unicode(proprio.get_mail()),
             'upload': "%.2f" % (elupload,),
@@ -332,11 +331,11 @@ def upload_soft(proprio, elupload, elid, eltype, curseur):
             'lang_info':'English version below',
             'limite_soft': upload.soft,
             'limite_hard': upload.hard,
-        }).as_string()
+        }
         if not DEBUG:
-            smtp_connect.sendmail(upload.expediteur, unicode(proprio.get_mail()), corps)
+            smtp_connect.send_template('upload_soft', mail_data)
         else:
-            print corps
+            print mail_module.generate('upload_soft', mail_data).as_string()
 
 def single_check(eltype, elid, elupload, ldap, curseur):
     """Fait un test sur un utilisateur, et