projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a double entity
[platal.git]
/
include
/
xnet
/
page.inc.php
diff --git
a/include/xnet/page.inc.php
b/include/xnet/page.inc.php
index
6190b5f
..
dd0cca3
100644
(file)
--- a/
include/xnet/page.inc.php
+++ b/
include/xnet/page.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
7
Polytechnique.org *
+ * Copyright (C) 2003-200
8
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-88,17
+88,17
@@
class XnetPage extends PlatalPage
$sub['signaler un bug'] = array('href' => 'send_bug', 'class' => 'popup_840x600');
$menu["no_title"] = $sub;
$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();
if (S::logged() && $globals->asso()) {
$sub = array();
- $dim = $globals->asso('diminutif');
$sub['présentation'] = "login/$dim/";
$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['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";
}
if ($globals->asso('forum')) {
$sub['forum'] = "$dim/forum";
}
@@
-107,14
+107,14
@@
class XnetPage extends PlatalPage
}
}
$sub['événement'] = "$dim/events";
}
}
$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;
}
$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";
$sub = array();
$sub['modifier l\'accueil'] = "$dim/edit";
$sub['gérer les annonces'] = "$dim/admin/announces";