X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=2912a492357c17f1fd05ab49ee0c16289403006b;hb=b618f326e3a77c58b1340bbee9850a0efdb4212d;hp=74d785fbc75bd1f462eeb143492490accfb2dba5;hpb=b3ec63d58dc3bb0e0e380774bf62b410542deb6d;p=platal.git diff --git a/modules/search.php b/modules/search.php index 74d785f..2912a49 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' => $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), ); } @@ -38,18 +38,9 @@ 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); + Platal::page()->assign('formulaire',1); } function get_diplomas($school = null) @@ -72,8 +63,7 @@ class SearchModule extends PLModule $types = explode('(',$row[1]); $types = str_replace("'","",substr($types[1],0,-1)); } - global $page; - $page->assign('choix_diplomas', explode(',',$types)); + Platal::page()->assign('choix_diplomas', explode(',',$types)); } function handler_quick(&$page, $action = null, $subaction = null) @@ -90,14 +80,14 @@ class SearchModule extends PLModule if (Env::has('quick') || $action == 'geoloc') { $quick = trim(Env::v('quick')); if (S::logged() && !Env::has('page')) { - $_SESSION['log']->log('search', 'quick=' . $quick); + S::logger()->log('search', 'quick=' . $quick); } $list = 'profile|prf|fiche|fic|referent|ref|mentor'; - if (S::has_perms()) { + if (S::admin()) { $list .= '|admin|adm|ax'; } if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', replace_accent($quick), $matches)) { - $forlife = $matches[2]; + $login = $matches[2]; switch($matches[1]) { case 'admin': case 'adm': $base = 'admin/user/'; @@ -113,13 +103,12 @@ class SearchModule extends PLModule break; } - require_once 'user.func.inc.php'; - $login = get_user_forlife($forlife, '_silent_user_callback'); - if ($login) { - pl_redirect($base . $login); + $user = User::getSilent($login); + if ($user) { + pl_redirect($base . $user->login()); } - $_REQUEST['quick'] = $forlife; - $_GET['quick'] = $forlife; + $_REQUEST['quick'] = $login; + $_GET['quick'] = $login; } elseif (strpos($quick, 'doc:') === 0) { $url = 'Docs/Recherche?'; $url .= 'action=search&q=' . urlencode(substr($quick, 4)); @@ -131,7 +120,7 @@ class SearchModule extends PLModule 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', false, array('with_annu' => 'search/adv')); @@ -155,17 +144,18 @@ class SearchModule extends PLModule $page->addJsLink('ajax.js'); } - require_once dirname(__FILE__) . '/search/search.inc.php'; + $this->load('search.inc.php'); $page->changeTpl('search/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Annuaire'); + $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'; + $this->load('search.inc.php'); $page->assign('advanced',1); + $page->addJsLink('jquery.autocomplete.js'); if (!Env::has('rechercher') && $action != 'geoloc') { $this->form_prepare(); @@ -177,14 +167,14 @@ class SearchModule extends PLModule '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", + 'text' => "(cat = 'GroupesX' OR 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) ); if (!Env::has('page')) { - $_SESSION['log']->log('search', 'adv=' . var_export($_GET, true)); + S::logger()->log('search', 'adv=' . var_export($_GET, true)); } foreach ($textFields as $field=>&$query) { if (!Env::v($field) && Env::v($field . 'Txt')) { @@ -199,7 +189,7 @@ class SearchModule extends PLModule 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', 'Planisphère', false, array('with_annu' => 'search/adv')); $view->apply('search/adv', $page, $action, $subaction);