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 7bbb1f8..6167647 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -26,9 +26,10 @@ global $globals;
 @$globals->search->result_where_statement = '
     LEFT JOIN  profile_education       AS edu ON (u.user_id = edu.uid)
     LEFT JOIN  profile_education_enum  AS ede ON (ede.id = edu.eduid)
-    LEFT JOIN  entreprises             AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
-    LEFT JOIN  emploi_secteur          AS es  ON (e.secteur = es.id)
-    LEFT JOIN  fonctions_def           AS ef  ON (e.fonction = ef.id)
+    LEFT JOIN  profile_job             AS j   ON (j.id = 0 AND j.uid = u.user_id)
+    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)
     LEFT JOIN  geoloc_pays             AS n1  ON (u.nationalite = n1.a2)
     LEFT JOIN  geoloc_pays             AS n2  ON (u.nationalite2 = n2.a2)
     LEFT JOIN  geoloc_pays             AS n3  ON (u.nationalite2 = n3.a2)
@@ -171,13 +172,13 @@ class MinificheView extends MultipageView
     public function fields()
     {
         global $globals;
-        return "u.user_id AS id, u.*,
+        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,
                 FIND_IN_SET('femme', u.flags) AS sexe,
-                e.entreprise, e.web AS job_web, es.label AS secteur, ef.fonction_fr AS fonction,
+                je.name AS entreprise, je.url AS job_web, es.name AS secteur, ef.fonction_fr AS fonction,
                 IF(n1.nat = '', n1.pays, n1.nat) AS nat1, n1.a2 AS iso3166_1,
                 IF(n2.nat = '', n2.pays, n2.nat) AS nat2, n2.a2 AS iso3166_2,
                 IF(n3.nat = '', n3.pays, n3.nat) AS nat3, n3.a2 AS iso3166_3,
@@ -201,9 +202,11 @@ class MinificheView extends MultipageView
 
     public function joins()
     {
-        return  "LEFT JOIN  entreprises                   AS e    ON (e.entrid = 0 AND e.uid = u.user_id".(S::logged() ? "" : " AND e.pub = 'public'").")
-                 LEFT JOIN  emploi_secteur                AS es   ON (e.secteur = es.id)
-                 LEFT JOIN  fonctions_def                 AS ef   ON (e.fonction = ef.id)
+        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)
                  LEFT JOIN  geoloc_pays                   AS n1   ON (u.nationalite = n1.a2)
                  LEFT JOIN  geoloc_pays                   AS n2   ON (u.nationalite2 = n2.a2)
                  LEFT JOIN  geoloc_pays                   AS n3   ON (u.nationalite3 = n3.a2)
@@ -229,9 +232,9 @@ class MinificheView extends MultipageView
                  LEFT JOIN  geoloc_pays                   AS gp   ON (adr.country = gp.a2)
                  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)" .
-                (S::logged() ?
-                "LEFT JOIN  contacts                      AS c   ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
+                INNER JOIN  profile_names_display         AS nd   ON (nd.user_id = u.user_id)
+                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') . ")"
                  : "");
     }
 
@@ -272,14 +275,15 @@ class MentorView extends MultipageView
 
     public function fields()
     {
-        return "m.uid, u.promo, u.hruid,
-                m.expertise, mp.pid, ms.secteur, ms.ss_secteur,
+        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";
     }
 
     public function joins()
     {
-        return "INNER JOIN  profile_names_display AS nd ON (nd.user_id = u.user_id)";
+        return "INNER JOIN  profile_names_display AS nd ON (nd.user_id = u.user_id)
+                INNER JOIN  profile_display       AS d  ON (d.pid = u.user_id)";
     }
 
     public function bounds()
@@ -321,12 +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, 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)
+        return "INNER JOIN  photo                 AS p  ON (p.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)";
     }
 
@@ -421,11 +426,12 @@ 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, u.promo, al.alias',
-                                   "INNER JOIN  adresses AS adrf  ON (adrf.uid = u.user_id $only_current)
-                                     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') . ")",
+            $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.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') . ")",
                                    'adrf.cityid = ' . Env::i('cityid'), null, null, 11);
             $page->assign('users', $it);
             break;