X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=23593c073fb8475921ad639d9ec3b16ac48fa50a;hb=47d7a24be4619466ce5936159d1efdf2eb25076b;hp=1b62a06f43b18b8803cddd2ec7c3cde57d1f53c9;hpb=8ded5b5ec36ef278cf18a4f8dd1f588011cd39a2;p=platal.git

diff --git a/modules/marketing.php b/modules/marketing.php
index 1b62a06..23593c0 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -178,7 +178,8 @@ class MarketingModule extends PLModule
         }
 
         $res = Xdb::query("SELECT  u.nom, u.prenom, u.promo, FIND_IN_SET('femme', u.flags) AS sexe,
-                                   a.alias AS forlife, b.alias AS bestalias, e.email, e.last
+                                   u.deces = '0000-00-00' AS alive, a.alias AS forlife, b.alias AS bestalias,
+                                   IF(e.email IS NOT NULL, e.email, IF(FIND_IN_SET('googleapps', u.mail_storage), 'googleapps', NULL)) AS email, e.last
                              FROM  auth_user_md5 AS u
                        INNER JOIN  aliases       AS a ON (a.id = u.user_id AND a.type = 'a_vie')
                        INNER JOIN  aliases       AS b ON (b.id = u.user_id AND FIND_IN_SET('bestalias', b.flags))
@@ -267,7 +268,7 @@ class MarketingModule extends PLModule
                 } else {
                     // On cherche les marketings précédents sur cette adresse
                     // email, en se restreignant au dernier mois
-                    
+
                     if (Marketing::get($uid, $email, true)) {
                         $page->assign('already', true);
                     } else {