Force baseurl because it is used in redirect

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index 1fcd390..db1eb6a 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -49,13 +49,13 @@ class SearchModule extends PLModule
                 '.$fields->get_select_statement().'
                 LEFT JOIN  auth_user_quick AS q  ON (u.user_id = q.user_id)
                 LEFT JOIN  aliases         AS a  ON (u.user_id = a.id AND a.type="a_vie")
-                LEFT JOIN  contacts        AS c  ON (c.uid='.Session::getInt('uid').'
+                LEFT JOIN  contacts        AS c  ON (c.uid='.S::v('uid').'
                                                      AND c.contact=u.user_id)
                 LEFT JOIN  watch_nonins    AS w  ON (w.ni_id=u.user_id
-                                                     AND w.uid='.Session::getInt('uid').')
+                                                     AND w.uid='.S::v('uid').')
                 '.$globals->search->result_where_statement.'
                     WHERE  '.$fields->get_where_statement()
-                    .(logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '')
+                    .(S::logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '')
                 .'
                  GROUP BY  u.user_id
                  ORDER BY  '.($order?($order.', '):'')
@@ -71,7 +71,7 @@ class SearchModule extends PLModule
 
     function form_prepare()
     {
-        global $page,$globals;
+        global $page;
 
         $page->assign('formulaire',1);
         $page->assign('choix_nats',
@@ -92,7 +92,7 @@ class SearchModule extends PLModule
                       XDB::iterator('SELECT id,label FROM emploi_secteur ORDER BY label'));
 
         if (Env::has('school')) {
-            $sql = 'SELECT type FROM applis_def WHERE id='.Env::getInt('school');
+            $sql = 'SELECT type FROM applis_def WHERE id='.Env::i('school');
         } else {
             $sql = 'DESCRIBE applis_def type';
         }
@@ -133,10 +133,10 @@ class SearchModule extends PLModule
                 '.$fields->get_select_statement().'
                 '.(Env::has('only_referent') ? ' INNER JOIN mentor AS m ON (m.uid = u.user_id)' : '').'
                 LEFT JOIN  aliases        AS a ON (u.user_id = a.id AND a.type="a_vie")
-                LEFT JOIN  contacts       AS c ON (c.uid='.Session::getInt('uid').'
+                LEFT JOIN  contacts       AS c ON (c.uid='.S::v('uid').'
                                                    AND c.contact=u.user_id)
                 LEFT JOIN  watch_nonins   AS w ON (w.ni_id=u.user_id
-                                                   AND w.uid='.Session::getInt('uid').')
+                                                   AND w.uid='.S::v('uid').')
                 '.$globals->search->result_where_statement."
                     $where
                  ORDER BY  ".($order?($order.', '):'')
@@ -172,7 +172,7 @@ class SearchModule extends PLModule
 
             $nb_tot = $search->show();
 
-            if (!logged() && $nb_tot > $globals->search->public_max) {
+            if (!S::logged() && $nb_tot > $globals->search->public_max) {
                 new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.');
             } elseif ($nb_tot > $globals->search->private_max) {
                 new ThrowError('Recherche trop générale');
@@ -195,11 +195,7 @@ class SearchModule extends PLModule
         require_once 'geoloc.inc.php';
 
 
-        $page->changeTpl('search/index.tpl');
-
-        if ($mode == 'mini') {
-            $page->assign('simple', true);
-        }
+        $page->changeTpl('search/index.tpl', $mode == 'mini' ? SIMPLE : SKINNED);
 
         $page->assign('advanced',1);
         $page->assign('public_directory',0);