X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=f301cd66fbf76937e49a45d2a237ee09bb5214fc;hb=295d4c48a12e49274135d9f781862a45e5b8c5dc;hp=ea8491ad0831190a651408a52f7e084b4c5db77b;hpb=ff3eb9b7ade4406804e721579111384a768e7791;p=platal.git diff --git a/modules/search.php b/modules/search.php index ea8491a..f301cd6 100644 --- a/modules/search.php +++ b/modules/search.php @@ -80,7 +80,43 @@ class SearchModule extends PLModule { global $globals; + $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); + if (Env::has('quick') || $action == 'geoloc') { + $quick = trim(Env::v('quick')); + $list = 'profile|prf|fiche|fic|referent|ref|mentor'; + if (S::has_perms()) { + $list .= '|admin|adm|ax'; + } + if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', $quick, $matches)) { + $forlife = $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; + } + pl_redirect($base . $forlife); + } elseif (strpos($quick, 'doc:') === 0) { + $url = 'Docs/Recherche?'; + $url .= 'action=search&q=' . urlencode(substr($quick, 4)); + $url .= '&group=' . urlencode('-Equipe,-Main,-PmWiki,-Site'); + pl_redirect($url); + } + $page->assign('formulaire', 0); require_once 'userset.inc.php'; @@ -88,11 +124,12 @@ class SearchModule extends PLModule $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; } @@ -104,20 +141,13 @@ class SearchModule extends PLModule new ThrowError('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->changeTpl('search/index.tpl'); $page->assign('xorg_title','Polytechnique.org - Annuaire'); - $page->assign('baseurl', $globals->baseurl); } function handler_advanced(&$page, $action = null, $subaction = null) @@ -130,13 +160,36 @@ class SearchModule extends PLModule 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) + ); + 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', 'Planishpère'); - $view->apply('search', $page, $action, $subaction); - + $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); + $view->apply('search/adv', $page, $action, $subaction); + if ($subaction) { return; } @@ -170,7 +223,7 @@ class SearchModule extends PLModule $_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 @@ -181,15 +234,16 @@ class SearchModule extends PLModule echo $res; die(); } - + // default search + $q = preg_quote($q); $unique = '`user_id`'; $db = '`auth_user_md5`'; $realid = false; $beginwith = true; $field2 = false; $qsearch = $q; - + switch ($type) { case 'binetTxt': $db = '`binets_def` INNER JOIN @@ -218,7 +272,7 @@ class SearchModule extends PLModule $field = '`entreprise`'; $unique='`uid`'; break; - case '`firstname`': + case 'firstname': $field = '`prenom`'; $q = '(^|[ \\-])'.$q; $beginwith = false; @@ -233,13 +287,16 @@ class SearchModule extends PLModule $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`'; @@ -284,7 +341,7 @@ class SearchModule extends PLModule $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`'; @@ -332,7 +389,7 @@ class SearchModule extends PLModule 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 @@ -360,17 +417,20 @@ class SearchModule extends PLModule $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`'; + $db = '`geoloc_pays` INNER JOIN + `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)'; $field = 'IF(`nat`=\'\', `pays`, `nat`)'; $id = '`a2`'; break; case 'region': $db = '`geoloc_region`'; $field = '`name`'; - $id = '`region`'; + $id = '`region`'; if (isset($_REQUEST['country'])) { $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"'; } @@ -395,12 +455,15 @@ class SearchModule extends PLModule exit(); } header('Content-Type: text/xml; charset="UTF-8"'); - $page->changeTpl('include/select.field.tpl', NO_SKIN); + $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('name', $type); $page->assign('list', XDB::iterator('SELECT '.$field.' AS field, '.$id.' AS id 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"); } }