X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxnet%2Fpage.inc.php;h=c9ec66158d45ac3558f3cdbf77ac31f6d84e7e8b;hb=14256b085eed2ff3f3ca977894f0a506c849e819;hp=2874af84a3eaf44ca228c45e4e1f6038da62a9ce;hpb=4f355064724a95757bb5ca023f1da9950a04013d;p=platal.git

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 2874af8..c9ec661 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   *
@@ -21,13 +21,13 @@
 
 class XnetPage extends PlatalPage
 {
-    var $nomenu = false;
+    public $nomenu = false;
 
     // {{{ function XnetPage()
 
-    function XnetPage($tpl, $type=SKINNED)
+    public function __construct($tpl, $type=SKINNED)
     {
-        $this->PlatalPage($tpl, $type);
+        parent::__construct($tpl, $type);
 
         $this->register_function('list_all_my_groups', 'list_all_my_groups');
         $this->register_modifier('cat_pp', 'cat_pp');
@@ -41,7 +41,7 @@ class XnetPage extends PlatalPage
     // }}}
     // {{{ function run()
 
-    function run()
+    public function run()
     {
         if (!$this->nomenu) {
             $this->useMenu();
@@ -50,9 +50,25 @@ class XnetPage extends PlatalPage
     }
 
     // }}}
+    // {{{ function changeTpl()
+
+    public function changeTpl($tpl, $type = SKINNED)
+    {
+        global $globals;
+        parent::changeTpl($tpl, $type);
+        $this->assign('is_logged', S::logged());
+        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
 
-    function setType($type)
+    public function setType($type)
     {
         $this->assign('xnet_type', strtolower($type));
     }
@@ -60,7 +76,7 @@ class XnetPage extends PlatalPage
     // }}}
     // {{{ function useMenu
 
-    function useMenu()
+    private function useMenu()
     {
         global $globals;
 
@@ -69,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";
+                $sub['planisphère'] = "$dim/geoloc";
             }
-            if (is_member() || may_update()) {
+            if ($perms->hasFlag('groupmember')) {
                 if ($globals->asso('forum')) {
                     $sub['forum'] = "$dim/forum";
                 }
@@ -91,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";