X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=6a2a3c1f0fefef08403c4ff87545f039c5df0366;hb=7c5200a5e48db42ef10efc2d985fb02b88da822d;hp=b287c01a986b71bc325dd8d38357f3c92fcda832;hpb=d4775fe2dea4db5e6ca3db4a6034bb03a8b711cc;p=platal.git

diff --git a/modules/search.php b/modules/search.php
index b287c01..6a2a3c1 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -94,7 +94,7 @@ class SearchModule extends PLModule
                 $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/';
@@ -110,10 +110,9 @@ 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;
@@ -152,16 +151,16 @@ 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->setTitle('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');