From e8a29010f5a0a3a24cb305c20b6b369052e21403 Mon Sep 17 00:00:00 2001
From: Michel Blockelet <Michel.Blockelet@crans.org>
Date: Sun, 11 Sep 2011 23:48:07 +0200
Subject: [PATCH] [mail_invalide.py] On ne fait pas de fiche pour les gens plus
 sur le campus

Ignore-this: 3e208212fb5ead0fdc2191ea4251ee43

darcs-hash:20110911214807-ddb99-65d7c976cfab34747374289154f8a598a1deeef3.gz
---
 admin/mail_invalide/mail_invalide.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/admin/mail_invalide/mail_invalide.py b/admin/mail_invalide/mail_invalide.py
index e77f41a6..a803782f 100755
--- a/admin/mail_invalide/mail_invalide.py
+++ b/admin/mail_invalide/mail_invalide.py
@@ -79,14 +79,18 @@ def generate_ps(proprio, mail):
         log(utils.exceptions.formatExc())
         raise e
 
-def set_mail_invalide(adherent, mail):
-    print "Génération de la fiche pour %s :" % adherent.Nom().encode('utf-8')
-    fiche = generate_ps(adherent, mail)
-    print fiche
-    a_imprimer.append(fiche)
-    adherent.blacklist([time.time() + 14 * 24 * 3600,
-        '-', 'mail_invalide', "Mail invalide"])
-    adherent.save()
+def set_mail_invalide(adherent, mail, a_verifier, a_imprimer):
+    if adherent.chbre() not in ['????', 'EXT']:
+        print "Génération de la fiche pour %s :" % adherent.Nom().encode('utf-8')
+        fiche = generate_ps(adherent, mail)
+        print fiche
+        a_imprimer.append(fiche)
+        adherent.blacklist([time.time() + 14 * 24 * 3600,
+            '-', 'mail_invalide', "Mail invalide"])
+        adherent.save()
+    else:
+        print "Chambre de %s : %s, impossible de générer la fiche." % (adherent.Nom().encode('utf-8'), adherent.chbre())
+        a_verifier.append(mail)
 
 if __name__ == "__main__":
     if '--help' in sys.argv or '-h' in sys.argv or len(sys.argv) < 2:
@@ -122,7 +126,7 @@ if __name__ == "__main__":
                 a_verifier.append(adresse)
             else:
                 adherent = res[0]
-                a_imprimer.append(set_mail_invalide(adherent, adherent.email()))
+                set_mail_invalide(adherent, adherent.email(), a_verifier, a_imprimer)
             continue
 
         print " * Recherche de %s ..." % adresse
@@ -134,7 +138,7 @@ if __name__ == "__main__":
                 a_verifier.append(adresse)
             else:
                 adherent = res[0]
-                a_imprimer.append(set_mail_invalide(adherent, adresse))
+                set_mail_invalide(adherent, adresse, a_verifier, a_imprimer)
                 continue
 
         # Est-ce une adresse mail sans compte Cr@ns ?
@@ -149,7 +153,7 @@ if __name__ == "__main__":
             a_verifier.append(adresse)
         else:
             adherent = res[0]
-            a_imprimer.append(set_mail_invalide(adherent, adherent.email()))
+            set_mail_invalide(adherent, adherent.email(), a_verifier, a_imprimer)
 
     if len(a_verifier) + len(a_imprimer) > 0:
         print ''