<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function handlers()
{
return array(
- '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),
+ '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),
+ 'search/list/count' => $this->make_hook('list_count', 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;
* $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)
+ function handler_quick($page, $model = null, $byletter = null)
{
global $globals;
$page->changeTpl('search/index.tpl');
$page->setTitle('Annuaire');
$page->assign('formulaire', 1);
- $page->addJsLink('ajax.js');
return;
}
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':
if ($user) {
pl_redirect($base . $user->login());
}
- $_REQUEST['quick'] = $login;
- $_GET['quick'] = $login;
+ Get::set('quick', $login);
} elseif (strpos($quick, 'doc:') === 0) {
$url = 'Docs/Recherche?';
$url .= 'action=search&q=' . urlencode(substr($quick, 4));
$page->assign('formulaire', 0);
require_once 'userset.inc.php';
- $view = new SearchSet(true);
+ $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));
}
} else {
$page->assign('formulaire',1);
- $page->addJsLink('ajax.js');
}
$page->changeTpl('search/index.tpl');
/** $model is the way of presenting the results: minifiche, trombi, geoloc.
*/
- function handler_advanced(&$page, $model = null, $byletter = null)
+ 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);
+ $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();
}
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);
+ // 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));
- $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 !');
+ }
}
}
$page->changeTpl('search/index.tpl', $model == 'mini' ? SIMPLE : SKINNED);
- $page->addJsLink('ajax.js');
$page->assign('public_directory',0);
}
- 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.
'groupexTxt' => DirEnum::GROUPESX,
'sectionTxt' => DirEnum::SECTIONS,
'networking_typeTxt' => DirEnum::NETWORKS,
- 'city' => DirEnum::LOCALITIES,
+ 'localityTxt' => DirEnum::LOCALITIES,
'countryTxt' => DirEnum::COUNTRIES,
'entreprise' => DirEnum::COMPANIES,
'jobtermTxt' => DirEnum::JOBTERMS,
$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);
break;
case 'country':
$ids = DirEnum::getOptionsIter(DirEnum::COUNTRIES);
- $page->assign('onchange', 'changeCountry(this.value)');
+ $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)');
+ break;
+ case 'administrative_area_level_1':
+ case 'administrative_area_level_2':
+ case 'administrative_area_level_3':
+ case 'locality':
+ $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)');
+ case 'sublocality':
+ $ids = XDB::iterator("SELECT pace1.id, pace1.long_name AS field
+ FROM profile_addresses_components_enum AS pace1
+ INNER JOIN profile_addresses_components AS pac1 ON (pac1.component_id = pace1.id)
+ INNER JOIN profile_addresses_components AS pac2 ON (pac1.pid = pac2.pid AND pac1.jobid = pac2.jobid AND pac1.id = pac2.id
+ AND pac1.groupid = pac2.groupid AND pac1.type = pac2.type)
+ INNER JOIN profile_addresses_components_enum AS pace2 ON (pac2.component_id = pace2.id AND FIND_IN_SET({?}, pace2.types))
+ WHERE pace2.id = {?} AND FIND_IN_SET({?}, pace1.types)
+ GROUP BY pace1.long_name",
+ Env::v('previous'), Env::v('value'), $type);
break;
case 'diploma':
if (Env::has('school') && Env::i('school') != 0) {
case 'nationalite':
$ids = DirEnum::getOptionsIter(DirEnum::NATIONALITIES);
break;
- case 'region':
- if (Env::has('country')) {
- $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS, Env::v('country'));
- } else {
- $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS);
- }
- break;
case 'school':
$ids = DirEnum::getOptionsIter(DirEnum::EDUSCHOOLS);
$page->assign('onchange', 'changeSchool(this.value)');
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);
+ JobTerms::ajaxGetBranch($page, JobTerms::ONLY_JOBS);
return;
} else {
pl_content_headers('text/xml');
$page->assign('list', $ids);
}
- function handler_referent(&$page, $action = null, $subaction = null)
+ function handler_referent($page, $action = null, $subaction = null)
{
global $globals;
$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()) {
* 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)
+ 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.countryFR AS field
+ $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 countryFR", $jtid);
+ GROUP BY gc.iso_3166_1_a2
+ ORDER BY gc.country", $jtid);
$page->assign('list', $it);
}
}
projects / platal.git / blobdiff