X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxnet%2Fpage.inc.php;h=dd0cca3330e07a27050d1af41d7cf929c913b5f5;hb=70bea6bffe1674738e39070e18228cb781455ae9;hp=0bbfbad9f8b7814a896e32480e8e5438e073b82f;hpb=1490093c909c086ce8eba3c0f5c24b62ef20cfb3;p=platal.git

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 0bbfbad..dd0cca3 100644
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -57,14 +57,14 @@ class XnetPage extends PlatalPage
         global $globals;
         parent::changeTpl($tpl, $type);
         $this->assign('is_logged', S::logged());
-        if ($globals->asso('id')) {  
+        if ($globals->asso('id')) {
             $this->assign('asso', $globals->asso());
             $this->setType($globals->asso('cat'));
             $this->assign('is_admin', may_update());
             $this->assign('is_member', is_member());
         }
     }
-    
+
     // }}}
     // {{{ function setType
 
@@ -85,20 +85,20 @@ class XnetPage extends PlatalPage
         $sub = array();
         $sub['liste des groupes'] = 'plan';
         $sub['documentation']     = 'Xnet';
-        $sub['signaler un bug']   = array('href' => 'send_bug', 'class' => 'popup_840x600'); 
+        $sub['signaler un bug']   = array('href' => 'send_bug', 'class' => 'popup_840x600');
         $menu["no_title"]   = $sub;
-        
+
+        $perms = S::v('perms');
+        $dim = $globals->asso('diminutif');
         if (S::logged() && $globals->asso()) {
             $sub = array();
-            $dim = $globals->asso('diminutif');
             $sub['présentation'] = "login/$dim/";
-            if (may_update() || (is_member()  && $globals->asso('pub') == 'public')
-                || $globals->asso('cat') == 'Promotions') {
+            if ($perms->hasFlag('groupannu')) {
                 $sub['annuaire du groupe'] = "$dim/annuaire";
                 $sub['trombinoscope'] = "$dim/trombi";
                 $sub['carte'] = "$dim/geoloc";
             }
-            if (is_member() || may_update()) {
+            if ($perms->hasFlag('groupmember')) {
                 if ($globals->asso('forum')) {
                     $sub['forum'] = "$dim/forum";
                 }
@@ -107,14 +107,14 @@ class XnetPage extends PlatalPage
                 }
             }
             $sub['événement'] = "$dim/events";
-            if (may_update() || is_member()) {
+            if ($perms->hasFlag('groupmember')) {
                 $sub['télépaiement'] = "$dim/payment";
             }
 
             $menu[$globals->asso('nom')] = $sub;
         }
 
-        if (S::logged() && may_update()) {
+        if ($globals->asso() && is_object($perms) && $perms->hasFlag('groupadmin')) {
             $sub = array();
             $sub['modifier l\'accueil'] = "$dim/edit";
             $sub['gérer les annonces'] = "$dim/admin/announces";