$page is not anymore a global variable.

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index a708d12..b5ac4dd 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -47,9 +47,7 @@ class SearchModule extends PLModule
 
     function form_prepare()
     {
-        global $page;
-
-        $page->assign('formulaire',1);
+        Platal::page()->assign('formulaire',1);
     }
 
     function get_diplomas($school = null)
@@ -72,8 +70,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,7 +87,7 @@ 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()) {
@@ -166,6 +163,7 @@ class SearchModule extends PLModule
         require_once 'geoloc.inc.php';
         require_once dirname(__FILE__) . '/search/search.inc.php';
         $page->assign('advanced',1);
+        $page->addJsLink('jquery.autocomplete.js');
 
         if (!Env::has('rechercher') && $action != 'geoloc') {
             $this->form_prepare();
@@ -184,7 +182,7 @@ class SearchModule extends PLModule
                 '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')) {
@@ -390,7 +388,7 @@ class SearchModule extends PLModule
         while ($result = $list->next()) {
             $nbResults++;
             if ($nbResults == 11) {
-                $res .= '...|1'."\n";
+                $res .= $q."|-1\n";
             } else {
                 $res .= $result['field'].'|';
                 $res .= $result['nb'];