X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=8aa13cf42ec57304dc1263db9c837938b413cf49;hb=63c81443a0000525310d8c554b630782f914b65e;hp=dd1fc3a1360f7c5312a577bc66fd3ac7185bcce2;hpb=d095003a464fc7477c4566ee30ef917950842303;p=platal.git diff --git a/modules/search.php b/modules/search.php index dd1fc3a..8aa13cf 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ $this->make_hook('quick', AUTH_PUBLIC), 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE), + 'search/ajax/region' => $this->make_hook('region', AUTH_COOKIE, 'user', NO_AUTH), + 'search/ajax/grade' => $this->make_hook('grade', AUTH_COOKIE, 'user', NO_AUTH), + 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), ); } + function handler_redir_advanced(&$page, $mode = null) + { + pl_redirect('search/adv'); + exit; + } + + function on_subscribe($forlife, $uid, $promo, $pass) + { + require_once 'user.func.inc.php'; + user_reindex($uid); + } + function get_quick($offset, $limit, $order) { global $globals; + if (!S::logged()) { + Env::kill('with_soundex'); + } $qSearch = new QuickSearch('quick'); $fields = new SFieldGroup(true, array($qSearch)); if ($qSearch->isempty()) { - new ThrowError('Recherche trop générale.'); + new ThrowError('Recherche trop générale.'); } $sql = 'SELECT SQL_CALC_FOUND_ROWS @@ -49,13 +67,13 @@ class SearchModule extends PLModule '.$fields->get_select_statement().' LEFT JOIN auth_user_quick AS q ON (u.user_id = q.user_id) LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") - LEFT JOIN contacts AS c ON (c.uid='.Session::getInt('uid').' + LEFT JOIN contacts AS c ON (c.uid='.S::i('uid', -1).' AND c.contact=u.user_id) LEFT JOIN watch_nonins AS w ON (w.ni_id=u.user_id - AND w.uid='.Session::getInt('uid').') + AND w.uid='.S::i('uid', -1).') '.$globals->search->result_where_statement.' WHERE '.$fields->get_where_statement() - .(logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '') + .(S::logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '') .' GROUP BY u.user_id ORDER BY '.($order?($order.', '):'') @@ -63,48 +81,60 @@ class SearchModule extends PLModule 'u.promo DESC, NomSortKey, prenom'))).' LIMIT '.$offset * $globals->search->per_page.',' .$globals->search->per_page; - $list = $globals->xdb->iterator($sql); - $res = $globals->xdb->query("SELECT FOUND_ROWS()"); + $list = XDB::iterator($sql); + $res = XDB::query("SELECT FOUND_ROWS()"); $nb_tot = $res->fetchOneCell(); return array($list, $nb_tot); } function form_prepare() { - global $page,$globals; + global $page; $page->assign('formulaire',1); $page->assign('choix_nats', - $globals->xdb->iterator('SELECT a2 AS id,IF(nat=\'\',pays,nat) AS text - FROM geoloc_pays ORDER BY text')); + XDB::iterator('SELECT g.a2 AS id, IF(nat=\'\', g.pays, g.nat) AS text + FROM geoloc_pays AS g + INNER JOIN auth_user_md5 AS u ON (u.nationalite = g.a2) + GROUP BY g.a2 + ORDER BY text')); $page->assign('choix_postes', - $globals->xdb->iterator('SELECT id,fonction_fr FROM fonctions_def + XDB::iterator('SELECT id,fonction_fr FROM fonctions_def ORDER BY fonction_fr')); $page->assign('choix_binets', - $globals->xdb->iterator('SELECT id,text FROM binets_def ORDER BY text')); + XDB::iterator('SELECT id,text FROM binets_def ORDER BY text')); $page->assign('choix_groupesx', - $globals->xdb->iterator('SELECT id,text FROM groupesx_def ORDER BY text')); + XDB::iterator('SELECT id,text FROM groupesx_def ORDER BY text')); $page->assign('choix_sections', - $globals->xdb->iterator('SELECT id,text FROM sections ORDER BY text')); + XDB::iterator('SELECT id,text FROM sections ORDER BY text')); $page->assign('choix_schools', - $globals->xdb->iterator('SELECT id,text FROM applis_def ORDER BY text')); + XDB::iterator('SELECT id,text FROM applis_def ORDER BY text')); $page->assign('choix_secteurs', - $globals->xdb->iterator('SELECT id,label FROM emploi_secteur ORDER BY label')); + XDB::iterator('SELECT id,label FROM emploi_secteur ORDER BY label')); + $this->get_diplomas(); + } + + function get_diplomas($school = null) + { + if (is_null($school) && Env::has('school')) { + $school = Env::i('school'); + } - if (Env::has('school')) { - $sql = 'SELECT type FROM applis_def WHERE id='.Env::getInt('school'); + if (!is_null($school)) { + $sql = 'SELECT type FROM applis_def WHERE id=' . $school; } else { $sql = 'DESCRIBE applis_def type'; } - $res = $globals->xdb->query($sql); + $res = XDB::query($sql); $row = $res->fetchOneRow(); - if (Env::has('school')) { + if (!is_null($school)) { $types = $row[0]; } else { $types = explode('(',$row[1]); $types = str_replace("'","",substr($types[1],0,-1)); } + global $page; $page->assign('choix_diplomas', explode(',',$types)); } @@ -113,7 +143,7 @@ class SearchModule extends PLModule $fields = new SFieldGroup(true, advancedSearchFromInput()); if ($fields->too_large()) { $this->form_prepare(); - new ThrowError('Recherche trop générale.'); + new ThrowError('Recherche trop générale.'); } global $globals, $page; @@ -133,18 +163,19 @@ class SearchModule extends PLModule '.$fields->get_select_statement().' '.(Env::has('only_referent') ? ' INNER JOIN mentor AS m ON (m.uid = u.user_id)' : '').' LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") - LEFT JOIN contacts AS c ON (c.uid='.Session::getInt('uid').' + LEFT JOIN contacts AS c ON (c.uid='.S::v('uid').' AND c.contact=u.user_id) LEFT JOIN watch_nonins AS w ON (w.ni_id=u.user_id - AND w.uid='.Session::getInt('uid').') + AND w.uid='.S::v('uid').') '.$globals->search->result_where_statement." $where + GROUP BY u.user_id ORDER BY ".($order?($order.', '):'') .implode(',',array_filter(array($fields->get_order_statement(), 'promo DESC, NomSortKey, prenom'))).' LIMIT '.($offset * $limit).','.$limit; - $liste = $globals->xdb->iterator($sql); - $res = $globals->xdb->query("SELECT FOUND_ROWS()"); + $liste = XDB::iterator($sql); + $res = XDB::query("SELECT FOUND_ROWS()"); $nb_tot = $res->fetchOneCell(); return Array($liste, $nb_tot); } @@ -153,7 +184,7 @@ class SearchModule extends PLModule { global $globals; - require_once 'search.inc.php'; + require_once dirname(__FILE__).'/search/search.inc.php'; $page->changeTpl('search/index.tpl'); @@ -172,66 +203,81 @@ class SearchModule extends PLModule $nb_tot = $search->show(); - if (!logged() && $nb_tot > $globals->search->public_max) { - new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.'); + if (!S::logged() && $nb_tot > $globals->search->public_max) { + new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.'); } elseif ($nb_tot > $globals->search->private_max) { - new ThrowError('Recherche trop générale'); + new ThrowError('Recherche trop générale'); } elseif (empty($nb_tot)) { - new ThrowError('il n\'existe personne correspondant à ces critères dans la base !'); + new ThrowError('il n\'existe personne correspondant à ces critères dans la base !'); } } else { + $res = XDB::query("SELECT MIN(diminutif), MAX(diminutif) + FROM groupex.asso + WHERE cat = 'Promotions'"); + list($min, $max) = $res->fetchOneRow(); + $page->assign('promo_min', $min); + $page->assign('promo_max', $max); $page->assign('formulaire',1); + $page->addJsLink('ajax.js'); } $page->register_modifier('display_lines', 'display_lines'); - - return PL_OK; } function handler_advanced(&$page, $mode = null) { global $globals; - require_once 'search.inc.php' ; + require_once dirname(__FILE__).'/search/search.inc.php'; require_once 'applis.func.inc.php'; require_once 'geoloc.inc.php'; - $page->changeTpl('search/index.tpl'); - - if ($mode == 'mini') { - $page->assign('simple', true); - } + $page->changeTpl('search/index.tpl', $mode == 'mini' ? SIMPLE : SKINNED); $page->assign('advanced',1); $page->assign('public_directory',0); - $page->assign('use_map', $globals->geoloc->use_map()); if (!Env::has('rechercher')) { $this->form_prepare(); } else { - $search = new XOrgSearch(array($this, 'get_advanced')); $search->setNbLines($globals->search->per_page); $page->assign('url_search_form', $search->make_url(Array('rechercher'=>0))); - if (Env::has('with_soundex')) { - $page->assign('with_soundex', $search->make_url(Array())."&with_soundex=1"); + if (!Env::i('with_soundex')) { + $page->assign('with_soundex', $search->make_url(Array()) . "&with_soundex=1"); } - $nb_tot = $search->show(); if ($nb_tot > $globals->search->private_max) { $this->form_prepare(); - new ThrowError('Recherche trop générale'); + new ThrowError('Recherche trop générale'); } } + $page->addJsLink('ajax.js'); $page->register_modifier('display_lines', 'display_lines'); + } + + function handler_region(&$page, $country = null) + { + header('Content-Type: text/html; charset="UTF-8"'); + require_once("geoloc.inc.php"); + $page->ChangeTpl('search/adv.region.form.tpl', NO_SKIN); + $page->assign('region', ""); + $page->assign('country', $country); + } - return PL_OK; + function handler_grade(&$page, $school = null) + { + header('Content-Type: text/html; charset="UTF-8"'); + $page->ChangeTpl('search/adv.grade.form.tpl', NO_SKIN); + $page->assign('grade', ''); + $this->get_diplomas($school); } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>