Minor fixes

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

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index b82ccd8..6b8d9f1 100644 (file)
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -81,6 +81,7 @@ function new_groupadmin_page($tpl_name)
 
 function new_annu_page($tpl_name)
 {
+    global $globals;
     new_group_open_page($tpl_name, 
                             !may_update()
                             && (!is_member()  || $globals->asso('pub') != 'public')

diff --git a/include/xnet/session.inc.php b/include/xnet/session.inc.php
index 7fcb613..ce1ec8c 100644 (file)
--- a/include/xnet/session.inc.php
+++ b/include/xnet/session.inc.php
@@ -134,13 +134,14 @@ function may_update() {
 // }}}
 // {{{ is_member
 
-function is_member() {
+function is_member($force = false)
+{
     global $globals;
     $asso_id = $globals->asso('id');
     if (!$asso_id) { return false; }
     static $is_member;
     if (!$is_member) $is_member = array();
-    if (!isset($is_member[$asso_id]))
+    if (!isset($is_member[$asso_id]) || $force)
     {
         $res = XDB::query(
             "SELECT  COUNT(*)

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 5dbe9bb..7adea60 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -770,7 +770,7 @@ class XnetGrpModule extends PLModule
         } else {
             $page->trig('Vous avez été désinscrit du groupe, mais des erreurs se sont produites lors des désinscriptions des alias et des mailing-lists.');
         }
-        $page->assign('is_member', false);
+        $page->assign('is_member', is_member(true));
     }
 
     function handler_admin_member_del(&$page, $user = null)