X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=9d31ff47a533d6cc55470dad5d373b86e91d6d1d;hb=c4b453748e0affd8711c3a7a95ab6beaad2c2834;hp=c7d09f483303ad4102fbe535e75e58f92ef3c4e7;hpb=b159e33797ccfb84478dd2dbde700c7d1867539f;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index c7d09f4..9d31ff4 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -1,6 +1,6 @@ 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) @@ -160,23 +161,24 @@ class MinificheView extends MultipageView global $globals; $this->entriesPerPage = $globals->search->per_page; if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-date', '-promo', 'name_sort'), 'pertinence'); + $this->addSortKey('score', array('-score', '-date', '-d.promo', 'sort_name'), 'pertinence'); } - $this->addSortKey('name', array('name_sort'), 'nom'); - $this->addSortKey('promo', array('-promo', 'name_sort'), 'promotion'); - $this->addSortKey('date_mod', array('-date', '-promo', 'name_sort'), 'dernière modification'); + $this->addSortKey('name', array('sort_name'), 'nom'); + $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); + $this->addSortKey('date_mod', array('-date', '-d.promo', 'sort_name'), 'dernière modification'); parent::__construct($set, $data, $params); } 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, 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, @@ -194,15 +196,17 @@ class MinificheView extends MultipageView edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3.program AS eduprogram3, adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region, (COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif, - nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort" . + d.directory_name, d.sort_name" . (S::logged() ? ", c.contact AS contact" : ''); } 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) @@ -228,8 +232,7 @@ 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) - 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') . ")" : ""); } @@ -263,23 +266,22 @@ class MentorView extends MultipageView { $this->entriesPerPage = 10; $this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement'); - $this->addSortKey('name', array('name_sort'), 'nom'); - $this->addSortKey('promo', array('-promo', 'name_sort'), 'promotion'); - $this->addSortKey('date_mod', array('-date', '-promo', 'name_sort'), 'dernière modification'); + $this->addSortKey('name', array('sort_name'), 'nom'); + $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); + $this->addSortKey('date_mod', array('-date', '-d.promo', 'sort_name'), 'dernière modification'); parent::__construct($set, $data, $params); } public function fields() { - return "m.uid, d.promo_display, u.hruid, - m.expertise, mp.pid, ms.secteur, ms.ss_secteur, - nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort"; + return "m.uid, d.promo, u.hruid, + m.expertise, mp.country, ms.sectorid, ms.subsectorid, + d.directory_name, d.sort_name"; } 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)"; + return "INNER JOIN profile_display AS d ON (d.pid = u.user_id)"; } public function bounds() @@ -310,25 +312,24 @@ class TrombiView extends MultipageView public function __construct(PlSet &$set, $data, array $params) { $this->entriesPerPage = 24; - $this->order = explode(',', Env::v('order', 'name_sort')); + $this->order = explode(',', Env::v('order', 'sort_name')); if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'name_sort'), 'pertinence'); + $this->addSortKey('score', array('-score', '-watch_last', '-d.promo', 'sort_name'), 'pertinence'); } - $this->addSortKey('name', array('name_sort'), 'nom'); - $this->addSortKey('promo', array('-promo', 'name_sort'), 'promotion'); + $this->addSortKey('name', array('sort_name'), 'nom'); + $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); parent::__construct($set, $data, $params); } 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, d.directory_name, d.sort_name, 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_names_display AS nd ON (nd.user_id = 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)"; } public function bounds() @@ -422,9 +423,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') . ")",