X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=modules%2Fsearch.php;h=7fe8707678c52691797b938e4e4a43a259fa5576;hb=7f12e3b4113791f3372f11572a205925d7bb6b97;hp=f74b4f555785004b94caef737bbe5693e08329c9;hpb=ebd515f95f03f8a87f9b846d65e179b39a535222;p=platal.git

diff --git a/modules/search.php b/modules/search.php
index f74b4f5..7fe8707 100644
--- 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)
@@ -89,6 +86,9 @@ class SearchModule extends PLModule
 
         if (Env::has('quick') || $action == 'geoloc') {
             $quick = trim(Env::v('quick'));
+            if (S::logged() && !Env::has('page')) {
+                S::logger()->log('search', 'quick=' . $quick);
+            }
             $list = 'profile|prf|fiche|fic|referent|ref|mentor';
             if (S::has_perms()) {
                 $list .= '|admin|adm|ax';
@@ -128,7 +128,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'));
@@ -154,7 +154,7 @@ class SearchModule extends PLModule
 
         require_once dirname(__FILE__) . '/search/search.inc.php';
         $page->changeTpl('search/index.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Annuaire');
+        $page->setTitle('Polytechnique.org - Annuaire');
     }
 
     function handler_advanced(&$page, $action = null, $subaction = null)
@@ -163,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();
@@ -173,6 +174,8 @@ class SearchModule extends PLModule
                 '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),
+                'networking_type' => array('field' => 'network_type', 'table' => 'profile_networking_enum',
+                                           'text' => 'name', 'exact' => false),
                 'groupex' => array('field' => 'id', 'table' => 'groupex.asso',
                                    'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom",
                                    'exact' => false),
@@ -180,6 +183,9 @@ class SearchModule extends PLModule
                 'school' => array('field' => 'id', 'table' => 'applis_def', 'text' => 'text', 'exact' => false),
                 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false)
             );
+            if (!Env::has('page')) {
+                S::logger()->log('search', 'adv=' . var_export($_GET, true));
+            }
             foreach ($textFields as $field=>&$query) {
                 if (!Env::v($field) && Env::v($field . 'Txt')) {
                     $res = XDB::query("SELECT  {$query['field']}
@@ -193,7 +199,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);
@@ -260,6 +266,13 @@ class SearchModule extends PLModule
                 $beginwith = false;
             $realid = '`binets_def`.`id`';
             break;
+          case 'networking_typeTxt':
+            $db = '`profile_networking_enum` INNER JOIN
+                   `profile_networking` ON(`profile_networking`.`network_type` = `profile_networking_enum`.`network_type`)';
+            $field = '`profile_networking_enum`.`name`';
+            $unique = 'uid';
+            $realid = '`profile_networking_enum`.`network_type`';
+            break;
           case 'city':
             $db = '`geoloc_city` INNER JOIN
                    `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)';
@@ -384,7 +397,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'];
@@ -412,6 +425,11 @@ class SearchModule extends PLModule
           case 'binet':
             $db = '`binets_def`';
             break;
+          case 'networking_type':
+            $db = '`profile_networking_enum`';
+            $field = '`name`';
+            $id = '`network_type`';
+            break;
           case 'country':
             $db = '`geoloc_pays`';
             $field = '`pays`';