Fix admin layout on xnet

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index fd61899..2a27ceb 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -26,8 +26,8 @@ class SearchModule extends PLModule
         return array(
             'search'     => $this->make_hook('quick', AUTH_PUBLIC),
             'search/adv' => $this->make_hook('advanced', AUTH_COOKIE),
-            'search/ajax/region'  => $this->make_hook('region', AUTH_COOKIE, '', NO_AUTH),
-            'search/ajax/grade'   => $this->make_hook('grade',  AUTH_COOKIE, '', NO_AUTH),
+            'search/ajax/region'  => $this->make_hook('region', AUTH_COOKIE, 'user', NO_AUTH),
+            'search/ajax/grade'   => $this->make_hook('grade',  AUTH_COOKIE, 'user', NO_AUTH),
             'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC),
         );
     }
@@ -47,6 +47,9 @@ class SearchModule extends PLModule
     function get_quick($offset, $limit, $order)
     {
         global $globals;
+        if (!S::logged()) {
+            Env::kill('with_soundex');
+        }
         $qSearch = new QuickSearch('quick');
         $fields  = new SFieldGroup(true, array($qSearch));
 
@@ -90,8 +93,11 @@ class SearchModule extends PLModule
 
         $page->assign('formulaire',1);
         $page->assign('choix_nats',
-                      XDB::iterator('SELECT a2 AS id,IF(nat=\'\',pays,nat) AS text
-                                                 FROM geoloc_pays ORDER BY text'));
+                      XDB::iterator('SELECT  g.a2 AS id, IF(nat=\'\', g.pays, g.nat) AS text
+                                       FROM  geoloc_pays AS g
+                                 INNER JOIN  auth_user_md5 AS u ON (u.nationalite = g.a2)
+                                   GROUP BY  g.a2
+                                   ORDER BY  text'));
         $page->assign('choix_postes',
                       XDB::iterator('SELECT id,fonction_fr FROM fonctions_def
                                              ORDER BY fonction_fr'));
@@ -228,15 +234,13 @@ class SearchModule extends PLModule
         if (!Env::has('rechercher')) {
             $this->form_prepare();
         } else {
-
             $search = new XOrgSearch(array($this, 'get_advanced'));
             $search->setNbLines($globals->search->per_page);
 
             $page->assign('url_search_form', $search->make_url(Array('rechercher'=>0)));
-            if (Env::has('with_soundex')) {
-                $page->assign('with_soundex', $search->make_url(Array())."&with_soundex=1");
+            if (!Env::i('with_soundex')) {
+                $page->assign('with_soundex', $search->make_url(Array()) . "&with_soundex=1");
             }
-
             $nb_tot = $search->show();
 
             if ($nb_tot > $globals->search->private_max) {
@@ -252,7 +256,7 @@ class SearchModule extends PLModule
 
     function handler_region(&$page, $country = null)
     {
-        header('Content-Type: text/html; charset="iso-8859-15"');
+        header('Content-Type: text/html; charset="UTF-8"');
         require_once("geoloc.inc.php");
         $page->ChangeTpl('search/adv.region.form.tpl', NO_SKIN);
         $page->assign('region', "");
@@ -261,7 +265,7 @@ class SearchModule extends PLModule
 
     function handler_grade(&$page, $school = null)
     {
-        header('Content-Type: text/html; charset="iso-8859-15"');
+        header('Content-Type: text/html; charset="UTF-8"');
         $page->ChangeTpl('search/adv.grade.form.tpl', NO_SKIN);
         $page->assign('grade', '');
         $this->get_diplomas($school);