X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=b9ae916dfd599905ad5a2d11d9038d7ddf27b1e0;hb=18d4bfef9ab67ed8a83fd04f7b2cbf51ef97b02f;hp=2847322015d91d2f5da2e3f1748e5efe10015fb8;hpb=90ccb0625d5bdeafaf852ab5c9fb25ef230778b2;p=platal.git diff --git a/modules/search.php b/modules/search.php index 2847322..b9ae916 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), - 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH), - 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH), + 'search' => $this->make_hook('quick', AUTH_PUBLIC), + 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE, 'directory_ax'), + '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), + 'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE), ); } - function handler_redir_advanced(&$page, $mode = null) + 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 form_prepare() { - global $page; - - $page->assign('formulaire',1); - $page->assign('choix_schools', - XDB::iterator('SELECT id,text FROM applis_def ORDER BY text')); - $this->get_diplomas(); + Platal::page()->assign('formulaire',1); } - function get_diplomas($school = null) + /** + * $model: The way of presenting the results: minifiche, trombi, geoloc. + * $byletter: Show only names beginning with this letter + */ + function handler_quick($page, $model = null, $byletter = null) { - if (is_null($school) && Env::has('school')) { - $school = Env::i('school'); - } + global $globals; - if (!is_null($school)) { - $sql = 'SELECT type FROM applis_def WHERE id=' . $school; - } else { - $sql = 'DESCRIBE applis_def type'; - } + if (Env::has('quick') || $model == 'geoloc') { + $quick = Env::t('quick'); + if (S::logged() && !Env::has('page')) { + S::logger()->log('search', 'quick=' . $quick); + } - $res = XDB::query($sql); - $row = $res->fetchOneRow(); - 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)); - } + if ($quick == '') { + $page->trigWarning('Aucun critère de recherche n\'est spécifié.'); + $page->changeTpl('search/index.tpl'); + $page->setTitle('Annuaire'); + $page->assign('formulaire', 1); + return; + } - function handler_quick(&$page, $action = null, $subaction = null) - { - global $globals; + $list = 'profile|prf|fiche|fic|referent|ref|mentor'; + if (S::admin()) { + $list .= '|admin|adm|ax'; + } + $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': + $base = 'admin/user/'; + break; + case 'ax': + $base = 'profile/ax/'; + break; + case 'profile': case 'prf': case 'fiche': case 'fic': + $base = 'profile/'; + break; + case 'referent': case 'ref': case 'mentor': + $base = 'referent/'; + break; + } + + $user = User::getSilent($login); + if ($user) { + pl_redirect($base . $user->login()); + } + Get::set('quick', $login); + } elseif (strpos($quick, 'doc:') === 0) { + $url = 'Docs/Recherche?'; + $url .= 'action=search&q=' . urlencode(substr($quick, 4)); + $url .= '&group=' . urlencode('-Equipe,-Main,-PmWiki,-Site,-Review'); + pl_redirect($url); + } elseif (strpos($quick, 'trombi:') === 0) { + $promo = substr($quick, 7); + $res = XDB::query("SELECT diminutif + FROM groups + WHERE cat = 'Promotions' AND diminutif = {?}", + $promo); + if ($res->numRows() == 0) { + $page->trigWarning("La promotion demandée n'est pas valide: $promo"); + } else { + http_redirect('http://www.polytechnique.net/login/' . $promo . '/annuaire/trombi'); + } + } - if (Env::has('quick') || $action == 'geoloc') { $page->assign('formulaire', 0); require_once 'userset.inc.php'; - $view = new SearchSet(true, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Minifiches', true); - $view->addMod('trombi', 'Trombinoscope'); - $view->addMod('geoloc', 'Planishpère'); - $view->apply('search', $page, $action, $subaction); + $view = new QuickSearchSet(); + $view->addMod('minifiche', 'Mini-fiches', true, array('with_score' => true, 'starts_with' => $byletter)); + if (S::logged() && !Env::i('nonins')) { + $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true, 'with_score' => true)); + // TODO: Reactivate when the new map is completed. + // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); + } + $view->apply('search', $page, $model); $nb_tot = $view->count(); - if ($subaction) { - return; - } + $page->assign('search_results_nb', $nb_tot); 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.'); + $page->trigError('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'); + $page->trigError('Recherche trop générale. Une recherche avancée permet de préciser la recherche.'); } elseif (empty($nb_tot)) { - new ThrowError('il n\'existe personne correspondant à ces critères dans la base !'); + $page->trigError('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'); } - require_once dirname(__FILE__) . '/search/search.inc.php'; - $page->changeTpl('search/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Annuaire'); - $page->assign('baseurl', $globals->baseurl); - $page->register_modifier('display_lines', 'display_lines'); + $page->changeTpl('search/index.tpl'); + $page->setTitle('Annuaire'); } - function handler_advanced(&$page, $action = null, $subaction = null) + /** $model is the way of presenting the results: minifiche, trombi, geoloc. + */ + function handler_advanced($page, $model = null, $byletter = null) { global $globals; - if (!Env::has('rechercher') && $action != 'geoloc') { + $page->assign('advanced',1); + + $networks = DirEnum::getOptions(DirEnum::NETWORKS); + $networks[-1] = 'Tous types'; + $networks[0] = '-'; + ksort($networks); + $page->assign('networking_types', $networks); + $origin_corps_list = DirEnum::getOptions(DirEnum::CURRENTCORPS); + $current_corps_list = DirEnum::getOptions(DirEnum::ORIGINCORPS); + $corps_rank_list = DirEnum::getOptions(DirEnum::CORPSRANKS); + $origin_corps_list[0] = '-'; + $current_corps_list[0] = '-'; + $corps_rank_list[0] = '-'; + ksort($origin_corps_list); + ksort($current_corps_list); + ksort($corps_rank_list); + $page->assign('origin_corps_list', $origin_corps_list); + $page->assign('current_corps_list', $current_corps_list); + $page->assign('corps_rank_list', $corps_rank_list); + + if (!Env::has('rechercher') && $model != 'geoloc') { $this->form_prepare(); } else { - require_once 'userset.inc.php'; - $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Minifiches', true); - $view->addMod('trombi', 'Trombinoscope'); - $view->addMod('geoloc', 'Planishpère'); - $view->apply('search', $page, $action, $subaction); - - if ($subaction) { - return; + if (!Env::has('page')) { + S::logger()->log('search', 'adv=' . var_export($_GET, true)); } - $nb_tot = $view->count(); - if ($nb_tot > $globals->search->private_max) { + + require_once 'userset.inc.php'; + // Enable X.org fields for X.org admins, and AX fields for AX secretaries. + $view = new AdvancedSearchSet(S::admin(), + S::user()->checkPerms(User::PERM_EDIT_DIRECTORY)); + + if (!$view->isValid()) { $this->form_prepare(); - new ThrowError('Recherche trop générale'); + $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 !'); + } } } - require_once 'geoloc.inc.php'; - require_once dirname(__FILE__) . '/search/search.inc.php'; - $page->changeTpl('search/index.tpl', $action == 'mini' ? SIMPLE : SKINNED); - $page->addJsLink('ajax.js'); - $page->assign('advanced',1); + $page->changeTpl('search/index.tpl', $model == 'mini' ? SIMPLE : SKINNED); $page->assign('public_directory',0); - $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); - } - - 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); } - function handler_autocomplete(&$page, $type = null) + function handler_autocomplete($page, $type = null) { // Autocompletion : according to type required, return // a list of results matching with the number of matches. @@ -181,148 +220,214 @@ class SearchModule extends PLModule // result1|nb1 // result2|nb2 // ... - header('Content-Type: text/plain; charset="UTF-8"'); - $q = preg_replace('/\*+$/','',$_REQUEST['q']); + pl_content_headers("text/plain"); + $q = preg_replace(array('/\*+$/', // always look for $q* + '/([\^\$\[\]])/', // escape special regexp char + '/\*/'), // replace joker by regexp joker + array('', + '\\\\\1', + '.*'), + Env::s('q')); if (!$q) exit(); - // try to look in cached results - $cache = XDB::query('SELECT result FROM search_autocomplete WHERE name = {?} AND query = {?} AND generated > NOW() - INTERVAL 1 DAY', - $type, $q); + // try to look in cached results + $cache = XDB::query('SELECT result + FROM search_autocomplete + WHERE name = {?} AND + query = {?} AND + generated > NOW() - INTERVAL 1 DAY', + $type, $q); if ($res = $cache->fetchOneCell()) { - echo $res; - die(); + echo $res; + die(); } - - // default search - $unique = 'user_id'; - $db = 'auth_user_md5'; - $realid = false; - $contains = false; - - switch ($type) { - case 'binetTxt': - $db = 'binets_def INNER JOIN binets_ins ON(binets_def.id = binets_ins.binet_id)'; - $field='binets_def.text'; - if (strlen($q) > 2) - $contains = true; - $realid = 'binets_def.id'; - break; - case 'city': $db = 'geoloc_city INNER JOIN adresses ON(geoloc_city.id = adresses.cityid)'; $unique='uid'; $field='geoloc_city.name'; break; - case 'entreprise': $db = 'entreprises'; $field = 'entreprise'; $unique='uid'; break; - case 'firstname': $field = 'prenom'; break; - case 'fonctionTxt': - $db = 'fonctions_def INNER JOIN entreprises ON(entreprises.fonction = fonctions_def.id)'; - $field = 'fonction_fr'; - $unique = 'uid'; - $realid = 'fonctions_def.id'; - break; - case 'groupexTxt': - $db = 'groupesx_def INNER JOIN groupesx_ins ON(groupesx_def.id = groupesx_ins.gid)'; - $field='groupesx_def.text'; - if (strlen($q) > 2) - $contains = true; - $realid = 'groupesx_def.id'; - $unique = 'guid'; - break; - case 'name': $field = 'nom'; break; - case 'nationaliteTxt': - $db = 'geoloc_pays INNER JOIN auth_user_md5 ON(geoloc_pays.a2 = auth_user_md5.nationalite)'; - $field = 'IF(geoloc_pays.nat=\'\', geoloc_pays.pays, geoloc_pays.nat)'; - $realid = 'geoloc_pays.a2'; - break; - case 'nickname': $field = 'profile_nick'; $db = 'auth_user_quick'; break; - case 'poste': $db = 'entreprises'; $field = 'poste'; $unique='uid'; break; - case 'secteurTxt': - $db = 'emploi_secteur INNER JOIN entreprises ON(entreprises.secteur = emploi_secteur.id)'; - $field = 'emploi_secteur.label'; - $realid = 'emploi_secteur.id'; - $unique = 'uid'; - break; - case 'sectionTxt': - $db = 'sections INNER JOIN auth_user_md5 ON(auth_user_md5.section = sections.id)'; - $field = 'sections.text'; - $realid = 'sections.id'; - break; - default: exit(); + + $enums = array( + 'binetTxt' => DirEnum::BINETS, + 'groupexTxt' => DirEnum::GROUPESX, + 'sectionTxt' => DirEnum::SECTIONS, + 'networking_typeTxt' => DirEnum::NETWORKS, + 'city' => DirEnum::LOCALITIES, + 'countryTxt' => DirEnum::COUNTRIES, + 'entreprise' => DirEnum::COMPANIES, + 'jobtermTxt' => DirEnum::JOBTERMS, + 'description' => DirEnum::JOBDESCRIPTION, + 'nationaliteTxt' => DirEnum::NATIONALITIES, + 'schoolTxt' => DirEnum::EDUSCHOOLS, + ); + if (!array_key_exists($type, $enums)) { + exit(); } - $list = XDB::iterator(' - SELECT - '.$field.' AS field, - COUNT(DISTINCT '.$unique.') AS nb - '.($realid?(', '.$realid.' AS id'):'').' - FROM '.$db.' - WHERE '.$field.' LIKE {?} - GROUP BY '.$field.' - ORDER BY nb DESC - LIMIT 11', - ($contains?'%':'').str_replace('*','%',$q).'%'); + $enum = $enums[$type]; + + $list = DirEnum::getAutoComplete($enum, $q); $nbResults = 0; $res = ""; while ($result = $list->next()) { $nbResults++; if ($nbResults == 11) { - $res .= '...|1'."\n"; + $res .= $q."|-1\n"; } else { - $res .= $result['field'].'|'.$result['nb'].(isset($result['id'])?('|'.$result['id']):'')."\n"; + $res .= $result['field'].'|'; + if (isset($result['nb'])) { + $res .= $result['nb']; + } + if (isset($result['id'])) { + $res .= '|'.$result['id']; + } + $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(); } - - function handler_list(&$page, $type = null, $idVal = null) + + function handler_list($page, $type = null, $idVal = null) + { + $page->assign('name', $type); + $page->assign('with_text_value', true); + $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text"); + + // Give the list of all values possible of type and builds a select input for it + $ids = null; + + switch ($type) { + case 'binet': + $ids = DirEnum::getOptionsIter(DirEnum::BINETS); + break; + case 'networking_type': + $ids = DirEnum::getOptionsIter(DirEnum::NETWORKS); + break; + case 'country': + $ids = DirEnum::getOptionsIter(DirEnum::COUNTRIES); + $page->assign('onchange', 'changeCountry(this.value)'); + break; + case 'diploma': + if (Env::has('school') && Env::i('school') != 0) { + $ids = DirEnum::getOptionsIter(DirEnum::EDUDEGREES, Env::i('school')); + } else { + $ids = DirEnum::getOptionsIter(DirEnum::EDUDEGREES); + } + break; + case 'groupex': + $ids = DirEnum::getOptionsIter(DirEnum::GROUPESX); + break; + case 'nationalite': + $ids = DirEnum::getOptionsIter(DirEnum::NATIONALITIES); + break; + case 'administrativearea': + if (Env::has('country')) { + $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS, Env::v('country')); + } else { + $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS); + } + $page->assign('onchange', 'changeAdministrativeArea(this.value)'); + break; + case 'subadministrativearea': + if (Env::has('administrativearea')) { + $ids = DirEnum::getOptionsIter(DirEnum::SUBADMINAREAS, Env::v('administrativearea')); + } else { + $ids = DirEnum::getOptionsIter(DirEnum::SUBADMINAREAS); + } + break; + case 'school': + $ids = DirEnum::getOptionsIter(DirEnum::EDUSCHOOLS); + $page->assign('onchange', 'changeSchool(this.value)'); + break; + case 'section': + $ids = DirEnum::getOptionsIter(DirEnum::SECTIONS); + break; + case 'jobterm': + if (Env::has('jtid')) { + JobTerms::ajaxGetBranch($page, JobTerms::ONLY_JOBS); + return; + } else { + pl_content_headers('text/xml'); + echo '
'; // global container so that response is valid xml + echo ''; + echo ''; + echo '
'; // container where to create the tree + echo ''; + echo ''; + echo ''; + echo '
'; + exit(); + } + default: exit(); + } + if (isset($idVal)) { + pl_content_headers("text/plain"); + echo $ids[$idVal]; + exit(); + } + pl_content_headers("text/xml"); + $page->changeTpl('include/field.select.tpl', NO_SKIN); + $page->assign('list', $ids); + } + + function handler_referent($page, $action = null, $subaction = null) + { + global $globals; + + $wp = new PlWikiPage('Docs.Emploi'); + $wp->buildCache(); + + $page->setTitle('Emploi et Carrières'); + + // Count mentors + $res = XDB::query("SELECT count(distinct pid) FROM profile_mentor_term"); + $page->assign('mentors_number', $res->fetchOneCell()); + + // Search for mentors matching filters + require_once 'ufbuilder.inc.php'; + $ufb = new UFB_MentorSearch(); + if (!$ufb->isEmpty()) { + require_once 'userset.inc.php'; + $ufc = $ufb->getUFC(); + $set = new ProfileSet($ufc); + $set->addMod('mentor', 'Référents'); + $set->apply('referent/search', $page, $action, $subaction); + $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) { - // Give the list of all values possible of type and builds a select input for it - $field = 'text'; - $id = 'id'; - switch ($type) { - case 'binet': - $db = 'binets_def'; - break; - case 'fonction': - $db = 'fonctions_def'; - $field = 'fonction_fr'; - break; - case 'groupex': - $db = 'groupesx_def'; - break; - case 'nationalite': - $db = 'geoloc_pays'; - $field = 'IF(nat=\'\', pays, nat)'; - $id = 'a2'; - break; - case 'section': - $db = 'sections'; - break; - case 'secteur': - $db = 'emploi_secteur'; - $field = 'label'; - break; - default: exit(); - } - if (isset($idVal)) { - header('Content-Type: text/plain; charset="UTF-8"'); - $result = XDB::query('SELECT '.$field.' AS field FROM '.$db.' WHERE '.$id.' = {?} LIMIT 1',$idVal); - echo $result->fetchOneCell(); - } else { - header('Content-Type: text/xml; charset="UTF-8"'); - $list = XDB::iterator(' - SELECT - '.$field.' AS field, - '.$id.' AS id - FROM '.$db.' - ORDER BY '.$field); - echo ''; - } - - exit(); + 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 gc.iso_3166_1_a2 + ORDER BY gc.country", $jtid); + $page->assign('list', $it); } }