From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Tue, 28 Nov 2006 20:07:05 +0000 (+0000)
Subject: #570: Fix geoloc skin on xnet && fix access right
X-Git-Tag: xorg/0.9.13~258
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6637dfcc392f5c89cca4c4ebb31aad7940ea5933;p=platal.git

#570: Fix geoloc skin on xnet && fix access right


git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1193 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/ChangeLog b/ChangeLog
index b75144b..73e06d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ Bug/Wish:
     * Register:
         - #277: Improve ergonomy                                           -FRU
 
+    * Xnet:
+        - #570: Fix geoloc skin                                            -FRU
+
 From 0.9.12 branch:
 
     * Search:
diff --git a/modules/geoloc.php b/modules/geoloc.php
index 5c0be63..ceb3243 100644
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -68,14 +68,20 @@ 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);
+            if ($globals->asso('cat') == 'Promotions') {
+                new_group_open_page('geoloc/index.tpl');
+            } elseif ($globals->asso('pub') == 'public') {
+                new_group_page('geoloc/index.tpl');
+            } else {
+                new_groupadmin_page('geoloc/index.tpl');
+            }
+        } else {
+            $page->changeTpl('geoloc/index.tpl');
         }
 
         require_once dirname(__FILE__).'/search/search.inc.php';
 
-        $page->changeTpl('geoloc/index.tpl');
         $fields = new SFieldGroup(true, advancedSearchFromInput());
         $search = str_replace('&amp;','&',$fields->get_url());
         if ((!Env::has('only_current') && !Env::has('rechercher')) || Env::v('only_current') == 'on')