X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxnet.inc.php;h=e9689e39ced2d4e45052f6ef3a4e0303d9597a77;hb=1d08054d724a64a6a3d136bd61348e3a8615b46a;hp=c684c7df6d29f974298575add9f14661cc6ce5da;hpb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;p=platal.git

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index c684c7d..e9689e3 100644
--- a/include/xnet.inc.php
+++ b/include/xnet.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   *
@@ -25,87 +25,16 @@ require_once('xnet/session.inc.php');
 $globals = new PlatalGlobals('XnetSession');
 XnetSession::init();
 
-// {{{ function new_skinned_page()
-
-function new_page($tpl_name, $type = SKINNED)
-{
-    global $page, $globals;
-    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)
 {
-    return new_page($tpl_name);
-}
-
-// }}}
-// {{{ function new_group_open_page()
-
-function new_group_open_page($tpl_name, $refuse_access = false)
-{
-    global $page, $globals;
-
-    new_page($tpl_name);
-
-    $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());
-}
-
-// }}}
-// {{{ function new_groupadmin_page()
-
-function new_groupadmin_page($tpl_name)
-{
-    new_group_open_page($tpl_name, !may_update());
-}
-
-// }}}
-// {{{ function new_annu_page()
-
-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');
-}
-
-// }}}
-// {{{ function new_admin_page()
-
-function new_admin_page($tpl_name)
-{
-    global $page, $globals;
-
-    new_page($tpl_name);
-
-    check_perms();
-
-    if ($globals->asso('cat')) {
-        $page->assign('asso', $globals->asso());
-        $page->setType($globals->asso('cat'));
+    global $page;
+    require_once("xnet/page.inc.php");
+    if (!$page instanceof XnetPage) {
+        $page = new XnetPage($tpl_name);
+    } else {
+        $page->changeTpl($tpl_name);
     }
 }
 
-// }}}
-
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>