From: Stéphane Jacob <jacou@melix.net>
Date: Wed, 24 Dec 2008 16:34:45 +0000 (+0100)
Subject: Fixes email in the minifiche.
X-Git-Tag: xorg/1.0.0~332^2~344^2~56
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=abc500104714c566322605f3864c42c516fb42d6;p=platal.git

Fixes email in the minifiche.
---

diff --git a/include/userset.inc.php b/include/userset.inc.php
index ebd37dd..f725210 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -173,6 +173,7 @@ class MinificheView extends MultipageView
     {
         global $globals;
         return "u.user_id AS id, u.*, d.promo_display,
+                CONCAT(a.alias, '@{$globals->mail->domain}') AS bestemail,
                 u.perms != 'pending' AS inscrit,
                 u.perms != 'pending' AS wasinscrit,
                 u.deces != 0 AS dcd, u.deces, u.matricule_ax,
@@ -201,7 +202,8 @@ class MinificheView extends MultipageView
 
     public function joins()
     {
-        return  "LEFT JOIN  profile_job                   AS j    ON (j.uid = u.user_id".(S::logged() ? "" : " AND j.pub = 'public'").")
+        return  "LEFT JOIN  aliases                       AS a    ON (u.user_id = a.id AND FIND_IN_SET('bestalias', a.flags))
+                 LEFT JOIN  profile_job                   AS j    ON (j.uid = u.user_id".(S::logged() ? "" : " AND j.pub = 'public'").")
                  LEFT JOIN  profile_job_enum              AS je   ON (je.id = j.jobid)
                  LEFT JOIN  profile_job_sector_enum       AS es   ON (j.sectorid = es.id)
                  LEFT JOIN  fonctions_def                 AS ef   ON (j.functionid = ef.id)