if (S::has_perms()) {
$list .= '|admin|adm|ax';
}
- if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/',
- $quick, $matches)) {
+ if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', replace_accent($quick), $matches)) {
$forlife = $matches[2];
switch($matches[1]) {
case 'admin': case 'adm':
$base = 'referent/';
break;
}
- pl_redirect($base . $forlife);
+
+ require_once 'user.func.inc.php';
+ $login = get_user_forlife($forlife, '_silent_user_callback');
+ if ($login) {
+ pl_redirect($base . $login);
+ }
+ $_REQUEST['quick'] = $forlife;
+ $_GET['quick'] = $forlife;
+ } 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);
}
-
+
$page->assign('formulaire', 0);
require_once 'userset.inc.php';
$view->addMod('minifiche', 'Minifiches', true, array('with_score' => true));
if (S::logged() && !Env::i('nonins')) {
$view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true, 'with_score' => true));
- $view->addMod('geoloc', 'Planisphère');
+ $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
}
$view->apply('search', $page, $action, $subaction);
$nb_tot = $view->count();
+ $page->assign('search_results_nb', $nb_tot);
if ($subaction) {
return;
}
}
require_once dirname(__FILE__) . '/search/search.inc.php';
- $page->changeTpl('search/index.tpl');
+ $page->changeTpl('search/index.tpl');
$page->assign('xorg_title','Polytechnique.org - Annuaire');
}
if (!Env::has('rechercher') && $action != 'geoloc') {
$this->form_prepare();
} else {
+ $textFields = array(
+ 'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false),
+ 'fonction' => array('field' => 'id', 'table' => 'fonctions_def', 'text' => 'fonction_fr', 'exact' => true),
+ 'secteur' => array('field' => 'id', 'table' => 'emploi_secteur', 'text' => 'label', 'exact' => false),
+ 'nationalite' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'),
+ 'binet' => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false),
+ 'groupex' => array('field' => 'id', 'table' => 'groupex.asso',
+ 'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom",
+ 'exact' => false),
+ 'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false),
+ 'school' => array('field' => 'id', 'table' => 'applis_def', 'text' => 'text', 'exact' => false),
+ 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false)
+ );
+ foreach ($textFields as $field=>&$query) {
+ if (!Env::v($field) && Env::v($field . 'Txt')) {
+ $res = XDB::query("SELECT {$query['field']}
+ FROM {$query['table']}
+ WHERE {$query['text']} " . ($query['exact'] ? " = {?}" :
+ " LIKE CONCAT('%', {?}, '%')"),
+ Env::v($field . 'Txt'));
+ $_REQUEST[$field] = $res->fetchOneCell();
+ }
+ }
+
require_once 'userset.inc.php';
$view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf');
$view->addMod('minifiche', 'Minifiches', true);
$view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
- $view->addMod('geoloc', 'Planisphère');
+ $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
$view->apply('search/adv', $page, $action, $subaction);
-
+
if ($subaction) {
return;
}
$_REQUEST['q']);
if (!$q) exit();
- // try to look in cached results
+ // try to look in cached results
$cache = XDB::query('SELECT `result`
FROM `search_autocomplete`
WHERE `name` = {?} AND
echo $res;
die();
}
-
+
// default search
$q = preg_quote($q);
$unique = '`user_id`';
$beginwith = true;
$field2 = false;
$qsearch = $q;
-
+
switch ($type) {
case 'binetTxt':
$db = '`binets_def` INNER JOIN
$beginwith = false;
break;
case 'groupexTxt':
- $db = '`groupesx_def` INNER JOIN
- `groupesx_ins` ON(`groupesx_def`.`id` = `groupesx_ins`.`gid`)';
- $field='`groupesx_def`.`text`';
+ $db = "groupex.asso AS a INNER JOIN
+ groupex.membres AS m ON(a.id = m.asso_id
+ AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')
+ AND a.pub = 'public')";
+ $field='a.nom';
+ $field2 = 'a.diminutif';
if (strlen($q) > 2)
$beginwith = false;
- $realid = '`groupesx_def`.`id`';
- $unique = '`guid`';
+ $realid = 'a.id';
+ $unique = 'm.uid';
break;
case 'name':
$field = '`nom`';
$beginwith = false;
break;
case 'sectionTxt':
- $db = '`sections` INNER JOIN
+ $db = '`sections` INNER JOIN
`auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)';
$field = '`sections`.`text`';
$realid = '`sections`.`id`';
echo $res;
exit();
}
-
+
function handler_list(&$page, $type = null, $idVal = null)
{
// Give the list of all values possible of type and builds a select input for it
$page->changeTpl('search/adv.grade.form.tpl', NO_SKIN);
return;
case 'groupex':
- $db = '`groupesx_def`';
+ $db = 'groupex.asso';
+ $where = " WHERE (cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public'";
+ $field = 'nom';
break;
case 'nationalite':
- $db = '`geoloc_pays` INNER JOIN
+ $db = '`geoloc_pays` INNER JOIN
`auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
$field = 'IF(`nat`=\'\', `pays`, `nat`)';
$id = '`a2`';
case 'region':
$db = '`geoloc_region`';
$field = '`name`';
- $id = '`region`';
+ $id = '`region`';
if (isset($_REQUEST['country'])) {
$where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"';
}
FROM '.$db.$where.'
GROUP BY '.$field.'
ORDER BY '.$field));
+ $page->assign('with_text_value', true);
+ $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
}
}
projects / platal.git / blobdiff