Release of plat/al 1.1.8

[platal.git] / classes / xnetpage.php

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index 69c121b..c124057 100644 (file)
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2013 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -100,10 +100,10 @@ class XnetPage extends PlPage
                 $sub['annuaire du groupe'] = "$dim/annuaire";
                 $sub['trombinoscope'] = "$dim/trombi";
             }
+            if ($globals->asso('forum')) {
+                $sub['forum'] = "$dim/forum";
+            }
             if ($perms->hasFlag('groupmember')) {
-                if ($globals->asso('forum')) {
-                    $sub['forum'] = "$dim/forum";
-                }
                 if ($globals->asso('mail_domain')) {
                     $sub['listes de diffusion'] = "$dim/lists";
                 }
@@ -112,7 +112,7 @@ class XnetPage extends PlPage
                 }
             }
             $sub['événement'] = "$dim/events";
-            if ($perms->hasFlag('groupmember')) {
+            if ($perms->hasFlag('groupadmin')) {
                 $sub['télépaiement'] = "$dim/payment";
             }
 
@@ -124,7 +124,9 @@ class XnetPage extends PlPage
             $sub['modifier l\'accueil'] = "$dim/edit";
             $sub['gérer les annonces'] = "$dim/admin/announces";
             if ($globals->asso('mail_domain')) {
-                $sub['envoyer un mail']     = "$dim/mail";
+                if (!$globals->asso('disable_mails')) {
+                    $sub['envoyer un mail']     = "$dim/mail";
+                }
                 $sub['créer une liste']     = "$dim/lists/create";
                 $sub['créer un alias']      = "$dim/alias/create";
             }