X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=3a357e42980601f97eb52fdcb048e1802ccc90ee;hb=8230e9f8eff954fb1103c8bdcf0d22557d419ae7;hp=aba0254f54ffaca2d037d814916bb5d3cef59a02;hpb=010268b2e818de5aa8db1cef05bca1c91701b2f9;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index aba0254..3a357e4 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -1,6 +1,6 @@ asso('id') . ') ' : '') - . 'LEFT JOIN auth_user_quick AS q USING (user_id) - LEFT JOIN aliases AS a ON (a.id = u.user_id AND type = \'a_vie\') - ' . $joins, + . 'LEFT JOIN auth_user_quick AS q USING (user_id)' . $joins, $where, 'u.user_id'); } @@ -62,25 +59,24 @@ class SearchSet extends UserSet private $order = null; private $quick = false; - public function __construct($quick = false, $no_search = false) + public function __construct($quick = false, $no_search = false, $join = '', $where = '') { - require_once dirname(__FILE__).'/../modules/search/search.inc.php'; - + Platal::load('search', 'search.inc.php'); if ($no_search) { return; } $this->quick = $quick; if ($quick) { - $this->getQuick(); + $this->getQuick($join, $where); } else { - $this->getAdvanced(); + $this->getAdvanced($join, $where); } } - private function getQuick() + private function getQuick($join, $where) { - require_once dirname(__FILE__).'/../modules/search/search.inc.php'; + Platal::load('search', 'search.inc.php'); global $globals; if (!S::logged()) { Env::kill('with_soundex'); @@ -88,18 +84,29 @@ class SearchSet extends UserSet $qSearch = new QuickSearch('quick'); $fields = new SFieldGroup(true, array($qSearch)); if ($qSearch->isEmpty()) { - new ThrowError('Recherche trop générale.'); + new ThrowError('Aucun critère de recherche n\'est spécifié.'); } $this->score = $qSearch->get_score_statement(); - parent::__construct("{$fields->get_select_statement()}", - $fields->get_where_statement() . - (S::logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '')); + $pwhere = $fields->get_where_statement(); + if (trim($pwhere)) { + if (trim($where)) { + $where .= ' AND '; + } + $where .= $pwhere; + } + if (S::logged() && Env::has('nonins')) { + if (trim($where)) { + $where .= ' AND '; + } + $where .= 'u.perms="pending" AND u.deces=0'; + } + parent::__construct($join . ' ' . $fields->get_select_statement(), $where); $this->order = implode(',',array_filter(array($fields->get_order_statement(), 'u.promo DESC, NomSortKey, prenom'))); } - private function getAdvanced() + private function getAdvanced($join, $where) { global $globals; $this->advanced = true; @@ -107,8 +114,8 @@ class SearchSet extends UserSet if ($fields->too_large()) { new ThrowError('Recherche trop générale.'); } - parent::__construct($fields->get_select_statement(), - $fields->get_where_statement()); + parent::__construct(@$join . ' ' . $fields->get_select_statement(), + @$where . ' ' . $fields->get_where_statement()); $this->order = implode(',',array_filter(array($fields->get_order_statement(), 'promo DESC, NomSortKey, prenom'))); } @@ -128,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 "; } @@ -137,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 ''; } @@ -153,34 +160,36 @@ class MinificheView extends MultipageView global $globals; $this->entriesPerPage = $globals->search->per_page; if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'nom', 'prenom'), 'pertinence'); + $this->addSortKey('score', array('-score', '-date', '-promo', 'nom', 'prenom'), 'pertinence'); } $this->addSortKey('name', array('nom', 'prenom'), 'nom'); $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); - $this->addSortKey('date', array('-watch_last', '-promo', 'nom', 'prenom'), 'dernière modification'); + $this->addSortKey('date_mod', array('-date', '-promo', 'nom', 'prenom'), '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.*, + 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, es.label AS secteur, ef.fonction_fr AS fonction, + e.entreprise, e.web AS job_web, es.label AS secteur, ef.fonction_fr AS fonction, IF(n.nat='',n.pays,n.nat) AS nat, n.a2 AS iso3166, ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type, ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type, adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region, IF(u.nom_usage<>'',u.nom_usage,u.nom) AS sortkey, - COUNT(em.email) > 0 AS actif" . (S::logged() ? ", c.contact AS contact" : ''); + (COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif" . + (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) + 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 n ON (u.nationalite = n.a2) @@ -189,15 +198,33 @@ class MinificheView extends MultipageView LEFT JOIN applis_ins AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1) LEFT JOIN applis_def AS ad1 ON (ad1.id = ai1.aid) LEFT JOIN adresses AS adr ON (u.user_id = adr.uid - AND FIND_IN_SET('active', adr.statut)) + 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 aliases AS a ON (a.id = u.user_id AND FIND_IN_SET('bestalias', a.flags)) LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')" . - (S::logged() ? + (S::logged() ? "LEFT JOIN contacts AS c On (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")" : ""); } + public function bounds() + { + $order = Env::v('order', $this->defaultkey); + $show_bounds = 0; + if (($order == "name") || ($order == "-name")) { + $this->bound_field = "nom"; + $show_bounds = 1; + } elseif (($order == "promo") || ($order == "-promo")) { + $this->bound_field = "promo"; + $show_bounds = -1; + } + if ($order{0} == '-') { + $show_bounds = -$show_bounds; + } + return $show_bounds; + } + public function templateName() { return 'include/plview.minifiche.tpl'; @@ -208,19 +235,35 @@ class MentorView extends MultipageView { public function __construct(PlSet &$set, $data, array $params) { - $this->entriesPerPage = 10; + $this->entriesPerPage = 10; $this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement'); - $this->addSortKey('name', array('nom', 'prenom'), 'nom'); - $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); - $this->addSortKey('date', array('-watch_last', '-promo', 'nom', 'prenom'), 'dernière modification'); - parent::__construct($set, $data, $params); + $this->addSortKey('name', array('nom', 'prenom'), 'nom'); + $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); + $this->addSortKey('date_mod', array('-date', '-promo', 'nom', 'prenom'), 'dernière modification'); + parent::__construct($set, $data, $params); } public function fields() { - return "m.uid, u.prenom, u.nom, u.promo, - a.alias AS bestalias, m.expertise, mp.pid, - ms.secteur, ms.ss_secteur"; + return "m.uid, u.prenom, u.nom, u.promo, u.hruid, + m.expertise, mp.pid, ms.secteur, ms.ss_secteur"; + } + + public function bounds() + { + $order = Env::v('order', $this->defaultkey); + $show_bounds = 0; + if (($order == "name") || ($order == "-name")) { + $this->bound_field = "nom"; + $show_bounds = 1; + } elseif (($order == "promo") || ($order == "-promo")) { + $this->bound_field = "promo"; + $show_bounds = -1; + } + if ($order{0} == '-') { + $show_bounds = -$show_bounds; + } + return $show_bounds; } public function templateName() @@ -245,7 +288,7 @@ class TrombiView extends MultipageView public function fields() { - return "u.user_id, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, a.alias AS forlife "; + return "u.user_id, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, u.hruid "; } public function joins() @@ -253,12 +296,29 @@ class TrombiView extends MultipageView return "INNER JOIN photo AS p ON (p.uid = u.user_id) "; } + public function bounds() + { + $order = Env::v('order', $this->defaultkey); + $show_bounds = 0; + if (($order == "name") || ($order == "-name")) { + $this->bound_field = "nom"; + $show_bounds = 1; + } elseif (($order == "promo") || ($order == "-promo")) { + $this->bound_field = "promo"; + $show_bounds = -1; + } + if ($order{0} == '-') { + $show_bounds = -$show_bounds; + } + return $show_bounds; + } + public function templateName() { return 'include/plview.trombi.tpl'; } - public function apply(PlatalPage &$page) + public function apply(PlPage &$page) { if (!empty($GLOBALS['IS_XNET_SITE'])) { global $globals; @@ -295,7 +355,7 @@ class GeolocView implements PlView return $args; } - public function apply(PlatalPage &$page) + public function apply(PlPage &$page) { require_once 'geoloc.inc.php'; require_once '../modules/search/search.inc.php'; @@ -326,11 +386,12 @@ class GeolocView implements PlView $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) + "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 av ON (" . getadr_join('av') . ")", + INNER JOIN adresses AS avg ON (" . getadr_join('avg') . ")", 'adrf.cityid = ' . Env::i('cityid'), null, null, 11); $page->assign('users', $it); break; @@ -354,9 +415,7 @@ class GeolocView implements PlView if (!$this->use_map()) { $page->assign('request_geodesix', true); } - if (!empty($GLOBALS['IS_XNET_SITE'])) { - $page->assign('no_annu', 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'; @@ -364,5 +423,46 @@ class GeolocView implements PlView } } +class GadgetView implements PlView +{ + public function __construct(PlSet &$set, $data, array $params) + { + $this->set =& $set; + } + + public function fields() + { + return "u.user_id AS id, u.*," . + (S::logged() ? "q.profile_mobile AS mobile, " : "IF(q.profile_mobile_pub = 'public', q.profile_mobile, NULL) as mobile, ") . + "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" . + (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') . ")" + : ""); + } + + public function apply(PlPage &$page) + { + $page->assign_by_ref('set', + $this->set->get($this->fields(), $this->joins(), null, null, null, 5, 0)); + } + + public function args() + { + return null; + } +} + // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>