X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=a0057ef82ba64a89441ab9d8e2d6e6570ecef1f1;hb=3c6bedb05f56db670e5555d0cbddb4e1c183b15f;hp=4996d5f6a48503fef258f2c2a23a8874a4d992cf;hpb=bc67c37cd9da2052d61288d927c913e467e90c41;p=platal.git
diff --git a/modules/search.php b/modules/search.php
index 4996d5f..a0057ef 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),
+ 'search' => $this->make_hook('quick', AUTH_PUBLIC),
+ 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE),
'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/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH),
+ 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH),
);
}
@@ -40,140 +38,129 @@ class SearchModule extends PLModule
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();
- }
-
- function get_diplomas($school = null)
- {
- if (is_null($school) && Env::has('school')) {
- $school = Env::i('school');
- }
-
- if (!is_null($school)) {
- $sql = 'SELECT type FROM applis_def WHERE id=' . $school;
- } else {
- $sql = 'DESCRIBE applis_def type';
- }
-
- $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));
+ Platal::page()->assign('formulaire',1);
}
function handler_quick(&$page, $action = null, $subaction = null)
{
global $globals;
+ $res = XDB::query("SELECT MIN(diminutif), MAX(diminutif)
+ FROM groups
+ WHERE cat = 'Promotions'");
+ list($min, $max) = $res->fetchOneRow();
+ $page->assign('promo_min', $min);
+ $page->assign('promo_max', $max);
+
if (Env::has('quick') || $action == 'geoloc') {
+ $quick = trim(Env::v('quick'));
+ if (S::logged() && !Env::has('page')) {
+ S::logger()->log('search', 'quick=' . $quick);
+ }
+ $list = 'profile|prf|fiche|fic|referent|ref|mentor';
+ if (S::admin()) {
+ $list .= '|admin|adm|ax';
+ }
+ if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', 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());
+ }
+ $_REQUEST['quick'] = $login;
+ $_GET['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);
+ }
+
$page->assign('formulaire', 0);
require_once 'userset.inc.php';
$view = new SearchSet(true, $action == 'geoloc' && substr($subaction, -3) == 'swf');
- $view->addMod('minifiche', 'Minifiches', true, array('with_score' => true));
+ $view->addMod('minifiche', 'Mini-fiches', 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');
+ // TODO: Reactivate when the new map is completed.
+ // $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;
}
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)
{
global $globals;
- require_once 'geoloc.inc.php';
- require_once dirname(__FILE__) . '/search/search.inc.php';
+ require_once 'geocoding.inc.php';
$page->assign('advanced',1);
+ $page->addJsLink('jquery.autocomplete.js');
if (!Env::has('rechercher') && $action != 'geoloc') {
$this->form_prepare();
} else {
+ if (!Env::has('page')) {
+ S::logger()->log('search', 'adv=' . var_export($_GET, true));
+ }
+
require_once 'userset.inc.php';
$view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf');
- $view->addMod('minifiche', 'Minifiches', true);
+ $view->addMod('minifiche', 'Mini-fiches', true);
$view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
- $view->addMod('geoloc', 'Planishpère');
- $view->apply('search', $page, $action, $subaction);
-
+ // TODO: Reactivate when the new map is completed.
+ // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
+ $view->apply('search/adv', $page, $action, $subaction);
+
if ($subaction) {
return;
}
$nb_tot = $view->count();
if ($nb_tot > $globals->search->private_max) {
$this->form_prepare();
- new ThrowError('Recherche trop générale');
+ $page->trigError('Recherche trop générale.');
}
}
$page->changeTpl('search/index.tpl', $action == 'mini' ? SIMPLE : SKINNED);
$page->addJsLink('ajax.js');
$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)
@@ -184,148 +171,131 @@ 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,
+ 'secteurTxt' => DirEnum::SECTORS,
+ '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);
+ XDB::query('REPLACE INTO search_autocomplete
+ VALUES ({?}, {?}, {?}, NOW())',
+ $type, $q, $res);
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
- $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();
+ // 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 'region':
+ if ($isset($_REQUEST['country'])) {
+ $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS, $_REQUEST['country']);
+ } else {
+ $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS);
+ }
+ break;
+ case 'school':
+ $ids = DirEnum::getOptionsIter(DirEnum::EDUSCHOOLS);
+ $page->assign('onchange', 'changeSchool(this.value)');
+ break;
+ case 'section':
+ $ids = DirEnum::getOptionsIter(DirEnum::SECTIONS);
+ break;
+ case 'secteur':
+ $ids = DirEnum::getOptionsIter(DirEnum::SECTORS);
+ break;
+ 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('name', $type);
+ $page->assign('list', $ids);
+ $page->assign('with_text_value', true);
+ $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
}
}