X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxnet.inc.php;h=e9689e39ced2d4e45052f6ef3a4e0303d9597a77;hb=613ba9ff7767991fff162cb65c5791c5ef0445db;hp=93724d894851de73d73c8b1beb2ecf47d9c76c1b;hpb=bd4be95d998237aa41abcf544aaabf82b73fdce0;p=platal.git

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index 93724d8..e9689e3 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-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,85 +20,21 @@
  ***************************************************************************/
 
 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()
-
-function new_page($tpl_name, $min_auth)
-{
-    global $page,$globals;
-    require_once("xnet/page.inc.php");
-    switch($min_auth) {
-        case AUTH_PUBLIC:
-            $page = new XnetPage($tpl_name, $type);
-            break;
-
-        default:
-            $page = new XnetAuth($tpl_name, $type);
-    }
-    $page->assign('xorg_tpl', $tpl_name);
-}
-
-function new_skinned_page($tpl_name, $min_auth)
+function new_skinned_page($tpl_name)
 {
-    return new_page($tpl_name, $min_auth);
-}
-
-// }}}
-function new_identification_page()
-{
-    new_page('', AUTH_MDP);
     global $page;
-    $page->useMenu();
-}
-
-// {{{ function new_group_page()
-
-function new_group_page($tpl_name)
-{
-    global $page,$globals;
-    require_once("xnet/page.inc.php");
-    $page = new XnetGroupPage($tpl_name);
-    $page->assign('xorg_tpl', $tpl_name);
-}
-
-// }}}
-// {{{ function new_groupadmin_page()
-
-function new_groupadmin_page($tpl_name)
-{
-    global $page,$globals;
     require_once("xnet/page.inc.php");
-    $page = new XnetGroupAdmin($tpl_name);
-    $page->assign('xorg_tpl', $tpl_name);
-}
-
-// }}}
-// {{{ function new_admin_page()
-
-function new_admin_page($tpl_name)
-{
-    global $page,$globals;
-    require_once("xnet/page.inc.php");
-    $page = new XnetAdmin($tpl_name);
-    $page->assign('xorg_tpl', $tpl_name);
-}
-
-// }}}
-// {{{ function new_nonhtml_page()
-
-function new_nonhtml_page($tpl_name)
-{
-    global $page, $globals;
-    require_once("xnet/page.inc.php");
-    $page = new XnetGroupPage($tpl_name, NO_SKIN);
-    $page->assign('xorg_tpl', $tpl_name);
+    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:
 ?>