X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=3a357e42980601f97eb52fdcb048e1802ccc90ee;hb=1f58ccb1e75eca08fbd04971d617ea372bc77b5a;hp=a35cdedc9d39f57869a72f79a787d2e091530a44;hpb=285596e4fdf65e9871c07bf33b6e674584868509;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index a35cded..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 a.type = \'a_vie\') - ' . $joins, + . 'LEFT JOIN auth_user_quick AS q USING (user_id)' . $joins, $where, 'u.user_id'); } @@ -64,8 +61,7 @@ class SearchSet extends UserSet 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; } @@ -80,7 +76,7 @@ class SearchSet extends UserSet 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'); @@ -139,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 "; } @@ -148,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 ''; } @@ -174,13 +170,14 @@ 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.*, + 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, @@ -204,12 +201,30 @@ class MinificheView extends MultipageView 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() ? "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'; @@ -230,9 +245,25 @@ class MentorView extends MultipageView public function fields() { - return "m.uid, u.prenom, u.nom, u.promo, - a.alias AS forlife, 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() @@ -257,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() @@ -265,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; @@ -307,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'; @@ -384,8 +432,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.*," . (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, @@ -405,7 +452,7 @@ class GadgetView implements PlView : ""); } - public function apply(PlatalPage &$page) + public function apply(PlPage &$page) { $page->assign_by_ref('set', $this->set->get($this->fields(), $this->joins(), null, null, null, 5, 0));