X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=0eb0033dbd40f58a42fd8d2298ed750ba5e2617e;hb=76cbe885cee40ea53bf1c52b70b44d792024f341;hp=c7d09f483303ad4102fbe535e75e58f92ef3c4e7;hpb=065cd7ed086ef7806f294f92e675f16232704d6a;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index c7d09f4..0eb0033 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\')'; - class UserSet extends PlSet { - public function __construct($joins = '', $where = '') + private $cond; + + public function __construct($cond = null) { - global $globals; - parent::__construct('auth_user_md5 AS u', - (!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)' . $joins, - $where, - 'u.user_id'); + $this->cond = new UFC_And(); + if (!is_null($cond)) { + $this->cond->addChild($cond); + } + } + + public function &get($fields, $joins, $where, $groupby, $order, $limitcount = null, $limitfrom = null) + { + $uf = new UserFilter($this->cond); + $users = $uf->getUsers($limitcount, $limitfrom); + $this->count = $uf->getTotalCount(); + return $users; } } @@ -160,95 +148,22 @@ 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, - 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, - 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, - 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, - 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" . - (S::logged() ? ", c.contact AS contact" : ''); - } - - public function joins() + public function bounds() { - 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) - 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) - LEFT JOIN profile_education_field_enum AS f0 ON (f0.id = edu0.fieldid) - LEFT JOIN profile_education AS edu1 ON (u.user_id = edu1.uid AND edu1.id = 1) - LEFT JOIN profile_education_enum AS ede1 ON (ede1.id = edu1.eduid) - LEFT JOIN profile_education_degree_enum AS edd1 ON (edd1.id = edu1.degreeid) - LEFT JOIN profile_education_field_enum AS f1 ON (f1.id = edu1.fieldid) - LEFT JOIN profile_education AS edu2 ON (u.user_id = edu2.uid AND edu2.id = 2) - LEFT JOIN profile_education_enum AS ede2 ON (ede2.id = edu2.eduid) - LEFT JOIN profile_education_degree_enum AS edd2 ON (edd2.id = edu2.degreeid) - LEFT JOIN profile_education_field_enum AS f2 ON (f2.id = edu2.fieldid) - LEFT JOIN profile_education AS edu3 ON (u.user_id = edu3.uid AND edu3.id = 3) - 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 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() ? - "LEFT JOIN contacts AS c ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")" - : ""); + return null; } - public function bounds() + public function fields() { - $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; + return null; } public function templateName() @@ -263,23 +178,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 +224,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 +335,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') . ")",