Merge commit 'origin/fusionax' into account

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index ebd37dd..6167647 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -172,7 +172,8 @@ class MinificheView extends MultipageView
     public function fields()
     {
         global $globals;
-        return "u.user_id AS id, u.*, d.promo_display,
+        return "u.user_id AS id, u.*, d.promo,
+                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)
@@ -231,7 +233,7 @@ class MinificheView extends MultipageView
                  LEFT JOIN  geoloc_region                 AS gr   ON (adr.country = gr.a2 AND adr.region = gr.region)
                  LEFT JOIN  emails                        AS em   ON (em.uid = u.user_id AND em.flags = 'active')
                 INNER JOIN  profile_names_display         AS nd   ON (nd.user_id = u.user_id)
-                INNER JOIN  profile_display               AS d    ON (d.uid = u.user_id)" . (S::logged() ?
+                INNER JOIN  profile_display               AS d    ON (d.pid = u.user_id)" . (S::logged() ?
                 "LEFT JOIN  contacts                      AS c    ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
                  : "");
     }
@@ -273,7 +275,7 @@ class MentorView extends MultipageView
 
     public function fields()
     {
-        return "m.uid, d.promo_display, u.hruid,
+        return "m.uid, d.promo, u.hruid,
                 m.expertise, mp.country, ms.sectorid, ms.subsectorid,
                 nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort";
     }
@@ -281,7 +283,7 @@ class MentorView extends MultipageView
     public function joins()
     {
         return "INNER JOIN  profile_names_display AS nd ON (nd.user_id = u.user_id)
-                INNER JOIN  profile_display       AS d  ON (d.uid = u.user_id)";
+                INNER JOIN  profile_display       AS d  ON (d.pid = u.user_id)";
     }
 
     public function bounds()
@@ -323,13 +325,13 @@ class TrombiView extends MultipageView
 
     public function fields()
     {
-        return "u.user_id, nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort, u.promo, d.promo_display, u.hruid ";
+        return "u.user_id, nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort, u.promo, d.promo, u.hruid ";
     }
 
     public function joins()
     {
         return "INNER JOIN  photo                 AS p  ON (p.uid = u.user_id)
-                INNER JOIN  profile_display       AS d  ON (d.uid = u.user_id)
+                INNER JOIN  profile_display       AS d  ON (d.pid = u.user_id)
                 INNER JOIN  profile_names_display AS nd ON (nd.user_id = u.user_id)";
     }
 
@@ -424,9 +426,9 @@ class GeolocView implements PlView
             header('Content-Type: text/xml');
             header('Pragma:');
             $only_current = Env::v('only_current', false)? ' AND FIND_IN_SET(\'active\', adrf.statut)' : '';
-            $it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, d.promo_display, al.alias',
+            $it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, d.promo, al.alias',
                                    "INNER JOIN  adresses        AS adrf ON (adrf.uid = u.user_id $only_current)
-                                    INNER JOIN  profile_display AS d    ON (d.uid = u.user_id)
+                                    INNER JOIN  profile_display AS d    ON (d.pid = u.user_id)
                                      LEFT JOIN  aliases         AS al   ON (u.user_id = al.id
                                                                             AND FIND_IN_SET('bestalias', al.flags))
                                     INNER JOIN  adresses        AS avg  ON (" . getadr_join('avg') . ")",