X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=73ba6c8faadbcd5b9b7489473f53f2b3c25fc805;hb=34465ab035104f739a54ec62660f04f874448627;hp=32dd5449631b92e7093d31d64201426ebc527ea0;hpb=a93519575833e6886e055abb8b43b3ada6f163bc;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index 32dd544..73ba6c8 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 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 { - public function __construct($joins = '', $where = '') + public function __construct(PlFilterCondition &$cond, $orders = 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'); + parent::__construct($cond, $orders); + } + + protected function buildFilter(PlFilterCondition &$cond, $orders) + { + return new UserFilter($cond, $orders); + } +} + +class ProfileSet extends PlSet +{ + public function __construct(PlFilterCondition &$cond, $orders = null) + { + parent::__construct($cond, $orders); + } + + protected function buildFilter(PlFilterCondition &$cond, $orders) + { + return new ProfileFilter($cond, $orders); } } -class SearchSet extends UserSet +class SearchSet extends ProfileSet { public $advanced = false; - private $score = null; - private $order = null; - private $quick = false; + private $score = null; + private $quick = false; - public function __construct($quick = false, $no_search = false, $join = '', $where = '') + public function __construct($quick = false, $no_search = false, PlFilterCondition $cond = null) { - Platal::load('search', 'search.inc.php'); if ($no_search) { return; } $this->quick = $quick; + + if (is_null($cond)) { + $this->conds = new PFC_And(); + } else if ($cond instanceof PFC_And) { + $this->conds = $cond; + } else { + $this->conds = new PFC_And($cond); + } + if ($quick) { - $this->getQuick($join, $where); + $this->getQuick(); } else { - $this->getAdvanced($join, $where); + $this->getAdvanced(); } } - private function getQuick($join, $where) + private function getQuick() { - Platal::load('search', 'search.inc.php'); - global $globals; if (!S::logged()) { Env::kill('with_soundex'); } - $qSearch = new QuickSearch('quick'); - $fields = new SFieldGroup(true, array($qSearch)); - if ($qSearch->isEmpty()) { - new ThrowError('Aucun critère de recherche n\'est spécifié.'); - } - $this->score = $qSearch->get_score_statement(); - $pwhere = $fields->get_where_statement(); - if (trim($pwhere)) { - if (trim($where)) { - $where .= ' AND '; - } - $where .= $pwhere; + + require_once 'ufbuilder.inc.php'; + $ufb = new UFB_QuickSearch(); + + if (!$ufb->isValid()) { + return; } + + $ufc = $ufb->getUFC(); + $this->conds->addChild($ufc); + + $orders = $ufb->getOrders(); + if (S::logged() && Env::has('nonins')) { - if (trim($where)) { - $where .= ' AND '; - } - $where .= 'u.perms="pending" AND u.deces=0'; + $this->conds = new PFC_And($this->conds, + new PFC_Not(new UFC_Dead()), + new PFC_Not(new UFC_Registered()) + ); } - parent::__construct($join . ' ' . $fields->get_select_statement(), $where); - $this->order = implode(',',array_filter(array($fields->get_order_statement(), - 'u.promo DESC, NomSortKey, prenom'))); + parent::__construct($this->conds, $orders); } - private function getAdvanced($join, $where) + private function getAdvanced() { - global $globals; $this->advanced = true; - $fields = new SFieldGroup(true, advancedSearchFromInput()); - if ($fields->too_large()) { - new ThrowError('Recherche trop générale.'); + require_once 'ufbuilder.inc.php'; + $ufb = new UFB_AdvancedSearch(); + + if (!$ufb->isValid()) { + return; } - 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'))); + + $this->conds->addChild($ufb->getUFC()); } - public function &get($fields, $joins, $where, $groupby, $order, $limitcount = null, $limitfrom = null) + public function &get(PlLimit $limit = null, $orders = array()) { - if ($this->score) { - $fields .= ', ' . $this->score; + $orders = array_merge($orders, $this->orders); + + $uf = $this->buildFilter($this->conds, $orders); + if (is_null($limit)) { + $limit = new PlLimit(20, 0); } - return parent::get($fields, $joins, $where, $groupby, $order, $limitcount, $limitfrom); + $it = $uf->getProfiles($limit); + $this->count = $uf->getTotalCount(); + return $it; } } @@ -136,26 +133,36 @@ class ArraySet extends UserSet { public function __construct(array $users) { - $where = $this->getUids($users); - if ($where) { - $where = "u.hruid IN ($where)"; + $hruids = User::getBulkHruid($users, array('User', '_silent_user_callback')); + if (is_null($hruids) || count($hruids) == 0) { + $cond = new PFC_False(); } else { - $where = " 0 "; + $cond = new UFC_Hruid($hruids); } - parent::__construct('', $where); + parent::__construct($cond); } +} - private function getUids(array $users) +abstract class ProfileView extends MultipageView +{ + protected function getBoundValue($obj) { - $users = User::getBulkHruid($users, array('User', '_silent_user_callback')); - if (is_null($users)) { - return ''; + if ($obj instanceof Profile) { + switch ($this->bound_field) { + case 'name': + $name = $obj->name('%l'); + return strtoupper($name); + case 'promo': + return $obj->promo(); + default: + return null; + } } - return '\'' . implode('\', \'', $users) . '\''; + return null; } } -class MinificheView extends MultipageView +class MinificheView extends ProfileView { public function __construct(PlSet &$set, $data, array $params) { @@ -163,92 +170,35 @@ class MinificheView extends MultipageView global $globals; $this->entriesPerPage = $globals->search->per_page; if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-date', '-d.promo', 'sort_name'), 'pertinence'); + $this->addSort(new PlViewOrder('score', array( + new UFO_Score(true), + new UFO_ProfileUpdate(true), + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'pertinence')); } - $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'); + $this->addSort(new PlViewOrder( + 'name', + array(new UFO_Name(Profile::DN_SORT)), + 'nom')); + $this->addSort(new PlViewOrder('promo', array( + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'promotion')); + $this->addSort(new PlViewOrder('date_mod', array( + new UFO_ProfileUpdate(true), + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'dernière modification')); parent::__construct($set, $data, $params); } - public function fields() - { - 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, - je.name AS entreprise, je.url AS job_web, es.name AS secteur, 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, - 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.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, - d.directory_name, d.sort_name" . - (S::logged() ? ", c.contact AS contact" : ''); - } - - public function joins() - { - 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) - 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 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_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') . ")" - : ""); - } - public function bounds() { $order = Env::v('order', $this->defaultkey); $show_bounds = 0; if (($order == "name") || ($order == "-name")) { - $this->bound_field = "nom"; + $this->bound_field = "name"; $show_bounds = 1; } elseif (($order == "promo") || ($order == "-promo")) { $this->bound_field = "promo"; @@ -266,30 +216,25 @@ class MinificheView extends MultipageView } } -class MentorView extends MultipageView +class MentorView extends ProfileView { public function __construct(PlSet &$set, $data, array $params) { $this->entriesPerPage = 10; - $this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement'); - $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'); + $this->addSort(new PlViewOrder('rand', array(new PFO_Random(S::i('uid'))), 'aléatoirement')); + $this->addSort(new PlViewOrder('name', array(new UFO_Name(Profile::DN_SORT)), 'nom')); + $this->addSort(new PlViewOrder('promo', array( + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'promotion')); + $this->addSort(new PlViewOrder('date_mod', array( + new UFO_ProfileUpdate(true), + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'dernière modification')); parent::__construct($set, $data, $params); } - public function fields() - { - 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_display AS d ON (d.pid = u.user_id)"; - } - public function bounds() { $order = Env::v('order', $this->defaultkey); @@ -313,31 +258,27 @@ class MentorView extends MultipageView } } -class TrombiView extends MultipageView +class TrombiView extends ProfileView { public function __construct(PlSet &$set, $data, array $params) { $this->entriesPerPage = 24; - $this->order = explode(',', Env::v('order', 'sort_name')); if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-watch_last', '-d.promo', 'sort_name'), 'pertinence'); + $this->addSort(new PlViewOrder('score', array( + new UFO_Score(true), + new UFO_ProfileUpdate(true), + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'pertinence')); } - $this->addSortKey('name', array('sort_name'), 'nom'); - $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); + $this->addSort(new PlViewOrder('name', array(new UFO_Name(Profile::DN_SORT)), 'nom')); + $this->addSort(new PlViewOrder('promo', array( + new UFO_Promo(UserFilter::DISPLAY, true), + new UFO_Name(Profile::DN_SORT), + ), 'promotion')); parent::__construct($set, $data, $params); } - public function fields() - { - 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.pid = u.user_id)"; - } - public function bounds() { $order = Env::v('order', $this->defaultkey); @@ -377,35 +318,9 @@ class GadgetView implements PlView $this->set =& $set; } - public function fields() - { - 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, 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 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) { - $page->assign_by_ref('set', - $this->set->get($this->fields(), $this->joins(), null, null, null, 5, 0)); + $page->assign_by_ref('set', $this->set->get(new PlLimit(5, 0))); } public function args()