X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=b824fc7dc5d91d71b36eab97fcf32bcc06f648f3;hb=8a43972f58f0a77015ae9e509f1c073d188874d2;hp=5d66dc19ca398b72f6b472141655bd798af5a82f;hpb=f875fdc7a9cd2b879598a1e0ac0cb73456e4e809;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index 5d66dc1..b824fc7 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 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) - LEFT JOIN adresses AS adr ON (u.user_id = adr.uid AND FIND_IN_SET(\'active\',adr.statut)) - 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\')'; +@$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 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_countries AS n1 ON (u.nationalite = n1.iso_3166_1_a2) + LEFT JOIN geoloc_countries AS n2 ON (u.nationalite2 = n2.iso_3166_1_a2) + LEFT JOIN geoloc_countries AS n3 ON (u.nationalite2 = n3.iso_3166_1_a2) + LEFT JOIN profile_addresses AS adr ON (u.user_id = adr.pid + AND FIND_IN_SET('current', adr.flags)) + LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_1_a2) + LEFT JOIN geoloc_administrativeareas AS gr ON (adr.countryId = gr.country + AND adr.administrativeAreaId = gr.id) + LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')"; class UserSet extends PlSet { @@ -46,9 +49,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 +138,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 +147,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 ''; } @@ -162,48 +163,57 @@ 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() { - return "u.user_id AS id, - u.*, a.alias AS forlife, + global $globals; + 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, - 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, + je.name AS entreprise, je.url AS job_web, es.name AS sector, ef.fonction_fr AS fonction, + IF(n1.nat = '', n1.countryFR, n1.nat) AS nat1, n1.iso_3166_1_a2 AS iso3166_1, + IF(n2.nat = '', n2.countryFR, n2.nat) AS nat2, n2.iso_3166_1_a2 AS iso3166_2, + IF(n3.nat = '', n3.countryFR, n3.nat) AS nat3, n3.iso_3166_1_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, + 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, - ede3.name AS eduname3, ede3.url AS eduurl3, edd3.degree AS edudegree3, + 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, + "// adr.localityId, gr.name AS region + . "gc.iso_3166_1_a2, gc.countryFR AS countrytxt (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) - 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) + return "LEFT JOIN aliases AS a ON (u.user_id = a.id AND FIND_IN_SET('bestalias', a.flags)) + LEFT JOIN search_name AS n ON (u.user_id = n.uid) + 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_countries AS n1 ON (u.nationalite = n1.iso_3166_1_a2) + LEFT JOIN geoloc_countries AS n2 ON (u.nationalite2 = n2.iso_3166_1_a2) + LEFT JOIN geoloc_countries AS n3 ON (u.nationalite3 = n3.iso_3166_1_a2) LEFT JOIN profile_education AS edu0 ON (u.user_id = edu0.uid AND edu0.id = 0) LEFT JOIN profile_education_enum AS ede0 ON (ede0.id = edu0.eduid) LEFT JOIN profile_education_degree_enum AS edd0 ON (edd0.id = edu0.degreeid) @@ -220,15 +230,16 @@ class MinificheView extends MultipageView LEFT JOIN profile_education_enum AS ede3 ON (ede3.id = edu3.eduid) LEFT JOIN profile_education_degree_enum AS edd3 ON (edd3.id = edu3.degreeid) LEFT JOIN profile_education_field_enum AS f3 ON (f3.id = edu3.fieldid) - LEFT JOIN adresses AS adr ON (u.user_id = adr.uid - AND FIND_IN_SET('active', adr.statut)".(S::logged() ? "" : " - AND adr.pub = 'public'").") - 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 profile_addresses AS adr ON (u.user_id = adr.pid + AND FIND_IN_SET('current', adr.flags)" + . (S::logged() ? "" : + "AND adr.pub = 'public'") . ") + LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_a2) + LEFT JOIN geoloc_administrativeareas AS gr ON (adr.countryId = gr.country + AND adr.administrativeAreaId = gr.id) 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_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') . ")" : ""); } @@ -261,23 +272,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, u.promo, - a.alias AS bestalias, 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)"; + return "INNER JOIN profile_display AS d ON (d.pid = u.user_id)"; } public function bounds() @@ -308,24 +318,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, a.alias AS forlife "; + 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_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() @@ -360,101 +370,6 @@ class TrombiView extends MultipageView } } -class GeolocView implements PlView -{ - private $set; - private $type; - private $params; - - public function __construct(PlSet &$set, $data, array $params) - { - $this->params = $params; - $this->set =& $set; - $this->type = $data; - } - - private function use_map() - { - return is_file(dirname(__FILE__) . '/../modules/geoloc/dynamap.swf') && - is_file(dirname(__FILE__) . '/../modules/geoloc/icon.swf'); - } - - public function args() - { - $args = $this->set->args(); - unset($args['initfile']); - unset($args['mapid']); - return $args; - } - - public function apply(PlPage &$page) - { - require_once 'geoloc.inc.php'; - require_once '../modules/search/search.inc.php'; - - switch ($this->type) { - case 'icon.swf': - header("Content-type: application/x-shockwave-flash"); - header("Pragma:"); - readfile(dirname(__FILE__).'/../modules/geoloc/icon.swf'); - exit; - - case 'dynamap.swf': - header("Content-type: application/x-shockwave-flash"); - header("Pragma:"); - readfile(dirname(__FILE__).'/../modules/geoloc/dynamap.swf'); - exit; - - case 'init': - $page->changeTpl('geoloc/init.tpl', NO_SKIN); - header('Content-Type: text/xml'); - header('Pragma:'); - if (!empty($GLOBALS['IS_XNET_SITE'])) { - $page->assign('background', 0xF2E9D0); - } - break; - - case 'city': - $page->changeTpl('geoloc/city.tpl', NO_SKIN); - 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') . ")", - 'adrf.cityid = ' . Env::i('cityid'), null, null, 11); - $page->assign('users', $it); - break; - - case 'country': - if (Env::has('debug')) { - $page->changeTpl('geoloc/country.tpl', SIMPLE); - } else { - $page->changeTpl('geoloc/country.tpl', NO_SKIN); - header('Content-Type: text/xml'); - header('Pragma:'); - } - $mapid = Env::has('mapid') ? Env::i('mapid', -2) : false; - list($countries, $cities) = geoloc_getData_subcountries($mapid, $this->set, 10); - $page->assign('countries', $countries); - $page->assign('cities', $cities); - break; - - default: - global $globals; - if (!$this->use_map()) { - $page->assign('request_geodesix', true); - } - $page->assign('annu', @$this->params['with_annu']); - $page->assign('protocole', @$_SERVER['HTTPS'] ? 'https' : 'http'); - $this->set->get('u.user_id', null, "u.perms != 'pending' AND u.deces = 0", "u.user_id", null); - return 'include/plview.geoloc.tpl'; - } - } -} - class GadgetView implements PlView { public function __construct(PlSet &$set, $data, array $params) @@ -464,25 +379,27 @@ 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, FIND_IN_SET('femme', u.flags) AS sexe, - adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region" . + " // adr.city, gr.name AS region + . "gc.iso_3166_1_a2, gc.countryFR AS countrytxt" . (S::logged() ? ", c.contact AS contact" : ''); } public function joins() { - return "LEFT JOIN adresses AS adr ON (u.user_id = adr.uid AND FIND_IN_SET('active', adr.statut)".(S::logged() ? "" : " - AND adr.pub = 'public'").") - 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)" . - (S::logged() ? - "LEFT JOIN contacts AS c ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")" - : ""); + return "LEFT JOIN profile_addresses AS adr ON (u.user_id = adr.pid AND + FIND_IN_SET('current', adr.flags)" + . (S::logged() ? "" : "AND adr.pub = 'public'") . ") + LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_1_a2) + LEFT JOIN geoloc_administrativeareas AS gr ON (adr.countryId = gr.country + AND adr.administrativeAreaId = gr.id) + " . (S::logged() ? + "LEFT JOIN contacts AS c ON (c.contact = u.user_id + AND c.uid = " . S::v('uid') . ")" : ""); } public function apply(PlPage &$page)