X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgeoloc.php;h=f54f57e41d677eb4dfe32e983812780c3d436310;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=e65af0ef05eb7c02e23798080e9c47b41ee2c650;hpb=509310c2ac89cb688a6bcf58778391184c684989;p=platal.git

diff --git a/modules/geoloc.php b/modules/geoloc.php
index e65af0e..f54f57e 100644
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -68,16 +68,17 @@ class GeolocModule extends PLModule
             $page->assign('request_geodesix', 1);
 
         if (!empty($GLOBALS['IS_XNET_SITE'])) {
-            $page->useMenu();
-            $page->setType($globals->asso('cat'));
             $page->assign('no_annu', 1);
+            new_annu_page('geoloc/index.tpl');
+        } else {
+            $page->changeTpl('geoloc/index.tpl');
         }
 
-        require_once 'search.inc.php';
-        $page->changeTpl('geoloc/index.tpl');
+        require_once dirname(__FILE__).'/search/search.inc.php';
+
         $fields = new SFieldGroup(true, advancedSearchFromInput());
         $search = str_replace('&','&',$fields->get_url());
-        if (!Env::has('only_current'))
+        if ((!Env::has('only_current') && !Env::has('rechercher')) || Env::v('only_current') == 'on')
             $search .= '&only_current=on';
         elseif (Env::i('only_current') != 'on')
             $search .= '&only_current=';
@@ -144,8 +145,8 @@ class GeolocModule extends PLModule
 
         $page->changeTpl('geoloc/city.tpl', NO_SKIN);
 
+        require_once dirname(__FILE__).'/search/search.inc.php';
         require_once('geoloc.inc.php');
-        require_once('search.inc.php');
 
         if (empty($GLOBALS['IS_XNET_SITE'])) {
             $usual_fields = advancedSearchFromInput();
@@ -186,8 +187,8 @@ class GeolocModule extends PLModule
             $page->changeTpl('geoloc/country.tpl', NO_SKIN);
         }
 
+        require_once dirname(__FILE__).'/search/search.inc.php';
         require_once 'geoloc.inc.php';
-        require_once 'search.inc.php';
 
         $querystring = $this->_make_qs();
         $page->assign('searchvars', $querystring);