X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=73ba6c8faadbcd5b9b7489473f53f2b3c25fc805;hb=34465ab035104f739a54ec62660f04f874448627;hp=3a357e42980601f97eb52fdcb048e1802ccc90ee;hpb=c3c43c0ebe734e2b43b5d5fdb6010d08358bc34b;p=platal.git diff --git a/include/userset.inc.php b/include/userset.inc.php index 3a357e4..73ba6c8 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -1,6 +1,6 @@ search->result_where_statement = ' - LEFT JOIN applis_ins AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0) - LEFT JOIN applis_def AS ad0 ON (ad0.id = ai0.aid) - 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 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 n ON (u.nationalite = n.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\')'; + protected function buildFilter(PlFilterCondition &$cond, $orders) + { + return new UserFilter($cond, $orders); + } +} -class UserSet extends PlSet +class ProfileSet 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 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; } } @@ -133,87 +133,72 @@ 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) { - require_once 'applis.func.inc.php'; + require_once 'education.func.inc.php'; global $globals; $this->entriesPerPage = $globals->search->per_page; if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-date', '-promo', 'nom', 'prenom'), '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('nom', 'prenom'), 'nom'); - $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); - $this->addSortKey('date_mod', array('-date', '-promo', 'nom', 'prenom'), '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.*, - 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(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 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".(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) - LEFT JOIN applis_ins AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0) - LEFT JOIN applis_def AS ad0 ON (ad0.id = ai0.aid) - 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)".(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"; + $this->bound_field = "name"; $show_bounds = 1; } elseif (($order == "promo") || ($order == "-promo")) { $this->bound_field = "promo"; @@ -231,24 +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('nom', 'prenom'), 'nom'); - $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); - $this->addSortKey('date_mod', array('-date', '-promo', 'nom', 'prenom'), '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, 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); @@ -272,30 +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', 'nom,prenom,promo')); if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'nom', 'prenom'), '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('nom', 'prenom'), 'nom'); - $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), '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, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, u.hruid "; - } - - public function joins() - { - return "INNER JOIN photo AS p ON (p.uid = u.user_id) "; - } - public function bounds() { $order = Env::v('order', $this->defaultkey); @@ -328,101 +311,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) @@ -430,32 +318,9 @@ class GadgetView implements PlView $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)); + $page->assign_by_ref('set', $this->set->get(new PlLimit(5, 0))); } public function args()