X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxnet.inc.php;h=c684c7df6d29f974298575add9f14661cc6ce5da;hb=8da0d3c16b9acf8d83318e45d635b1cd17e98dd6;hp=98275a312139501d23291470aefeaa4235602130;hpb=63528107273f1f5de8a83428dbdd70e5f25d3d7f;p=platal.git

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index 98275a3..c684c7d 100644
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,10 +20,9 @@
  ***************************************************************************/
 
 require_once('platal.inc.php');
-require_once('xnet/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xnet/session.inc.php');
-XnetGlobals::init();
-XnetGlobals::setlocale();
+$globals = new PlatalGlobals('XnetSession');
 XnetSession::init();
 
 // {{{ function new_skinned_page()
@@ -34,6 +33,7 @@ function new_page($tpl_name, $type = SKINNED)
     require_once("xnet/page.inc.php");
     $page = new XnetPage($tpl_name, $type);
     $page->assign('xorg_tpl', $tpl_name);
+    $page->assign('is_logged', S::logged());
 }
 
 function new_skinned_page($tpl_name)
@@ -42,21 +42,30 @@ function new_skinned_page($tpl_name)
 }
 
 // }}}
-// {{{ function new_group_page()
+// {{{ function new_group_open_page()
 
-function new_group_page($tpl_name)
+function new_group_open_page($tpl_name, $refuse_access = false)
 {
     global $page, $globals;
 
     new_page($tpl_name);
 
-    if (!is_member() && !S::has_perms()) {
-        $page->kill("You have not sufficient credentials");
-    }
-
-    $page->useMenu();
     $page->assign('asso', $globals->asso());
     $page->setType($globals->asso('cat'));
+    $page->assign('is_admin', may_update());
+    $page->assign('is_member', is_member());
+
+    if ($refuse_access) {
+        $page->kill("Vous n'avez pas les droits suffisants pour accéder à cette page");
+    }
+}
+
+// }}}
+// {{{ function new_group_page()
+
+function new_group_page($tpl_name)
+{
+    new_group_open_page($tpl_name, !is_member() && !S::has_perms());
 }
 
 // }}}
@@ -64,17 +73,19 @@ function new_group_page($tpl_name)
 
 function new_groupadmin_page($tpl_name)
 {
-    global $page, $globals;
-
-    new_page($tpl_name);
+    new_group_open_page($tpl_name, !may_update());
+}
 
-    if (!may_update()) {
-        $page->kill("You have not sufficient credentials");
-    }
+// }}}
+// {{{ function new_annu_page()
 
-    $page->useMenu();
-    $page->assign('asso', $globals->asso());
-    $page->setType($globals->asso('cat'));
+function new_annu_page($tpl_name)
+{
+    global $globals;
+    new_group_open_page($tpl_name, 
+                            !may_update()
+                            && (!is_member()  || $globals->asso('pub') != 'public')
+                            && $globals->asso('cat') != 'Promotions');
 }
 
 // }}}
@@ -88,7 +99,6 @@ function new_admin_page($tpl_name)
 
     check_perms();
 
-    $page->useMenu();
     if ($globals->asso('cat')) {
         $page->assign('asso', $globals->asso());
         $page->setType($globals->asso('cat'));
@@ -96,5 +106,6 @@ function new_admin_page($tpl_name)
 }
 
 // }}}
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>