X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=14383b4db317aaba6e51399f4f5a42e2126b7ca9;hb=4a0746a82545651c559ea3e593c810ce6fdef6a7;hp=190ee3b63108d651f38f1c478f9e446e488072e6;hpb=9dc65790548d3ad53842a80f91227d099ed199aa;p=platal.git diff --git a/modules/search.php b/modules/search.php index 190ee3b..14383b4 100644 --- a/modules/search.php +++ b/modules/search.php @@ -29,9 +29,10 @@ class SearchModule extends PLModule 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'directory_ax', NO_AUTH), 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'directory_ax', NO_AUTH), - 'jobs' => $this->make_hook('referent', AUTH_COOKIE), - 'emploi' => $this->make_hook('referent', AUTH_COOKIE), - 'referent/search' => $this->make_hook('referent', AUTH_COOKIE), + 'jobs' => $this->make_hook('referent', AUTH_COOKIE), + 'emploi' => $this->make_hook('referent', AUTH_COOKIE), + 'referent/search' => $this->make_hook('referent', AUTH_COOKIE), + 'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE), ); } @@ -73,7 +74,9 @@ class SearchModule extends PLModule if (S::admin()) { $list .= '|admin|adm|ax'; } - if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', replace_accent($quick), $matches)) { + $suffixes = array_keys(DirEnum::getOptions(DirEnum::ACCOUNTTYPES)); + $suffixes = implode('|', $suffixes); + if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.(?:[md]?\d{2,4}|' . $suffixes . '))?)?)$/', replace_accent($quick), $matches)) { $login = $matches[2]; switch($matches[1]) { case 'admin': case 'adm': @@ -149,10 +152,15 @@ class SearchModule extends PLModule function handler_advanced(&$page, $model = null, $byletter = null) { global $globals; - require_once 'geocoding.inc.php'; $page->assign('advanced',1); $page->addJsLink('jquery.autocomplete.js'); + $networks = DirEnum::getOptions(DirEnum::NETWORKS); + $networks[-1] = 'Tous types'; + $networks[0] = '-'; + ksort($networks); + $page->assign('networking_types', $networks); + if (!Env::has('rechercher') && $model != 'geoloc') { $this->form_prepare(); } else { @@ -162,19 +170,30 @@ class SearchModule extends PLModule require_once 'userset.inc.php'; $view = new SearchSet(false); - $view->addMod('minifiche', 'Mini-fiches', true, array('starts_with' => $byletter)); - $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true)); - // TODO: Reactivate when the new map is completed. - // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); - $view->apply('search/adv', $page, $model); - - $nb_tot = $view->count(); - if ($nb_tot > $globals->search->private_max) { - $this->form_prepare(); - $page->trigError('Recherche trop générale.'); - } else if ($nb_tot == 0) { + if (!$view->isValid()) { $this->form_prepare(); - $page->trigError('Il n\'existe personne correspondant à ces critères dans la base !'); + $page->trigError('Recherche invalide.'); + } else { + $view->addMod('minifiche', 'Mini-fiches', true, array('starts_with' => $byletter)); + $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true)); + // TODO: Reactivate when the new map is completed. + // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); + if (S::user()->checkPerms(User::PERM_EDIT_DIRECTORY) || S::admin()) { + $view->addMod('addresses', 'Adresses postales', false); + } + $view->apply('search/adv', $page, $model); + + $nb_tot = $view->count(); + if ($nb_tot > $globals->search->private_max) { + $this->form_prepare(); + if ($model != 'addresses' && (S::user()->checkPerms(User::PERM_EDIT_DIRECTORY) || S::admin())) { + $page->assign('suggestAddresses', true); + } + $page->trigError('Recherche trop générale.'); + } else if ($nb_tot == 0) { + $this->form_prepare(); + $page->trigError('Il n\'existe personne correspondant à ces critères dans la base !'); + } } } @@ -250,9 +269,13 @@ class SearchModule extends PLModule $res .= "\n"; } } - XDB::query('REPLACE INTO search_autocomplete - VALUES ({?}, {?}, {?}, NOW())', - $type, $q, $res); + if ($nbResults == 0) { + $res = $q."|-2\n"; + } + XDB::query('INSERT INTO search_autocomplete (name, query, result, generated) + VALUES ({?}, {?}, {?}, NOW()) + ON DUPLICATE KEY UPDATE result = VALUES(result), generated = VALUES(generated)', + $type, $q, $res); echo $res; exit(); } @@ -304,9 +327,6 @@ class SearchModule extends PLModule case 'section': $ids = DirEnum::getOptionsIter(DirEnum::SECTIONS); break; - case 'secteur': - $ids = DirEnum::getOptionsIter(DirEnum::SECTORS); - break; case 'jobterm': if (Env::has('jtid')) { JobTerms::ajaxGetBranch(&$page, JobTerms::ONLY_JOBS); @@ -337,18 +357,20 @@ class SearchModule extends PLModule function handler_referent(&$page, $action = null, $subaction = null) { + global $globals; + $wp = new PlWikiPage('Docs.Emploi'); $wp->buildCache(); $page->setTitle('Emploi et Carrières'); - // nb de mentors + // Count mentors $res = XDB::query("SELECT count(distinct pid) FROM profile_mentor_term"); $page->assign('mentors_number', $res->fetchOneCell()); $page->addJsLink('jquery.autocomplete.js'); - // On vient d'un formulaire + // Search for mentors matching filters require_once 'ufbuilder.inc.php'; $ufb = new UFB_MentorSearch(); if (!$ufb->isEmpty()) { @@ -357,14 +379,40 @@ class SearchModule extends PLModule $set = new ProfileSet($ufc); $set->addMod('mentor', 'Référents'); $set->apply('referent/search', $page, $action, $subaction); - if ($set->count() > 100) { - $page->assign('recherche_trop_large', true); + $nb_tot = $set->count(); + if ($nb_tot > $globals->search->private_max) { + $this->form_prepare(); + $page->trigError('Recherche trop générale.'); + $page->assign('plset_count', 0); + } else if ($nb_tot == 0) { + $this->form_prepare(); + $page->trigError('Il n\'existe personne correspondant à ces critères dans la base.'); } } $page->changeTpl('search/referent.tpl'); } + /** + * Builds a select field to choose among countries that referents + * know about. Only referents linked to term (jtid) are displayed. + * @param $jtid id of job term to restrict referents + */ + function handler_referent_countries(&$page, $jtid = null) + { + pl_content_headers("text/xml"); + $page->changeTpl('include/field.select.tpl', NO_SKIN); + $page->assign('name', 'country'); + $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.country AS field + FROM geoloc_countries AS gc + INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2) + INNER JOIN profile_mentor_term AS mt ON (mt.pid = mp.pid) + INNER JOIN profile_job_term_relation AS jtr ON (jtr.jtid_2 = mt.jtid) + WHERE jtr.jtid_1 = {?} + GROUP BY iso_3166_1_a2 + ORDER BY country", $jtid); + $page->assign('list', $it); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: