X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=c7d09f483303ad4102fbe535e75e58f92ef3c4e7;hb=33b6f5a0072343de978e05f855739322b94179e5;hp=ce536a43cd7d07b032a406955eeef87ae86932e3;hpb=7972436ae72911c7f2e8d5f3a26204a7ca0ee39d;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index ce536a4..c7d09f4 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -46,9 +46,7 @@ class UserSet extends PlSet (!empty($GLOBALS['IS_XNET_SITE']) ? 'INNER JOIN groupex.membres AS gxm ON (u.user_id = gxm.uid AND gxm.asso_id = ' . $globals->asso('id') . ') ' : '') - . 'LEFT JOIN auth_user_quick AS q USING (user_id) - LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = \'a_vie\') - ' . $joins, + . 'LEFT JOIN auth_user_quick AS q USING (user_id)' . $joins, $where, 'u.user_id'); } @@ -137,7 +135,7 @@ class ArraySet extends UserSet { $where = $this->getUids($users); if ($where) { - $where = "a.alias IN ($where)"; + $where = "u.hruid IN ($where)"; } else { $where = " 0 "; } @@ -146,7 +144,7 @@ class ArraySet extends UserSet private function getUids(array $users) { - $users = get_users_forlife_list($users, true, '_silent_user_callback'); + $users = User::getBulkHruid($users, array('User', '_silent_user_callback')); if (is_null($users)) { return ''; } @@ -172,24 +170,28 @@ class MinificheView extends MultipageView public function fields() { - return "u.user_id AS id, - u.*, a.alias AS forlife, + global $globals; + return "u.user_id AS id, u.*, d.promo_display, 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, - 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, - ede0.name AS eduname0, ede0.url AS eduurl0, edd0.degree AS edudegree0, + 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, + IF(ede0.abbreviation = '', ede0.name, ede0.abbreviation) AS eduname0, ede0.url AS eduurl0, + IF(edd0.abbreviation = '', edd0.degree, edd0.abbreviation) AS edudegree0, edu0.grad_year AS edugrad_year0, f0.field AS edufield0, edu0.program AS eduprogram0, - ede1.name AS eduname1, ede1.url AS eduurl1, edd1.degree AS edudegree1, + IF(ede1.abbreviation = '', ede1.name, ede1.abbreviation) AS eduname1, ede1.url AS eduurl1, + IF(edd1.abbreviation = '', edd1.degree, edd1.abbreviation) AS edudegree1, edu1.grad_year AS edugrad_year1, f1.field AS edufield1, edu1.program AS eduprogram1, - ede2.name AS eduname2, ede2.url AS eduurl2, edd2.degree AS edudegree2, - edu2.grad_year AS edugrad_year2, f2.field AS edufield2, edu2gram AS eduprogram2, - ede3.name AS eduname3, ede3.url AS eduurl3, edd3.degree AS edudegree3, - edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3gram AS eduprogram3, + IF(ede2.abbreviation = '', ede2.name, ede2.abbreviation) AS eduname2, ede2.url AS eduurl2, + IF(edd2.abbreviation = '', edd2.degree, edd2.abbreviation) AS edudegree2, + edu2.grad_year AS edugrad_year2, f2.field AS edufield2, edu2.program AS eduprogram2, + IF(ede3.abbreviation = '', ede3.name, ede3.abbreviation) AS eduname3, ede3.url AS eduurl3, + IF(edd3.abbreviation = '', edd3.degree, edd3.abbreviation) AS edudegree3, + 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" . @@ -226,9 +228,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.uid = u.user_id)" . (S::logged() ? + "LEFT JOIN contacts AS c ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")" : ""); } @@ -269,15 +271,15 @@ class MentorView extends MultipageView public function fields() { - return "m.uid, u.promo, - a.alias AS bestalias, m.expertise, mp.pid, - ms.secteur, ms.ss_secteur, + 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"; } 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.uid = u.user_id)"; } public function bounds() @@ -319,12 +321,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, a.alias AS forlife "; + 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 "; } 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.uid = u.user_id) INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)"; } @@ -419,11 +422,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_display, 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) + 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; @@ -464,8 +468,7 @@ class GadgetView implements PlView public function fields() { - return "u.user_id AS id, - u.*, a.alias AS forlife," . + return "u.user_id AS id, u.*," . "u.perms != 'pending' AS inscrit, u.perms != 'pending' AS wasinscrit, u.deces != 0 AS dcd, u.deces,