Merge branch 'platal-0.9.17'

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index 584fd37..c9ca317 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -38,13 +38,6 @@ class SearchModule extends PLModule
         exit;
     }
 
-    function on_subscribe($forlife, $uid, $promo, $pass)
-    {
-        require_once 'user.func.inc.php';
-        user_reindex($uid);
-    }
-
-
     function form_prepare()
     {
         Platal::page()->assign('formulaire',1);
@@ -128,7 +121,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'));
@@ -152,16 +145,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');
 
@@ -197,7 +190,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);