X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxnet.inc.php;h=cc6fc5b758bbbf04feb6b4325897f1811b6753e2;hb=2998edf118b3d6243171dd3294247ad1324ac343;hp=8978ab0cda686a5efcdcc296d7660bdf7489f12a;hpb=801fcad813666310da1ca5b6f07f91cfed1abbee;p=platal.git

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index 8978ab0..cc6fc5b 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-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,102 +19,13 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once('platal.inc.php');
-require_once('xnet/globals.inc.php');
-require_once('xnet/session.inc.php');
-XnetGlobals::init();
-XnetGlobals::setlocale();
-XnetSession::init();
+define('PL_GLOBALS_CLASS', 'PlatalGlobals');
+define('PL_LOGGER_CLASS', 'PlatalLogger');
+define('PL_SESSION_CLASS', 'XnetSession');
+define('PL_PAGE_CLASS', 'XnetPage');
 
-// {{{ function new_skinned_page()
+require_once dirname(dirname(__FILE__)) . '/core/include/platal.inc.php';
+require_once 'common.inc.php';
 
-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);
-}
-
-function new_skinned_page($tpl_name)
-{
-    return new_page($tpl_name);
-}
-
-// }}}
-// {{{ function new_group_page()
-
-function new_group_page($tpl_name)
-{
-    global $page, $globals;
-
-    new_page($tpl_name);
-
-    $page->doAuth(true);
-    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'));
-}
-
-// }}}
-// {{{ function new_groupadmin_page()
-
-function new_groupadmin_page($tpl_name)
-{
-    global $page, $globals;
-
-    new_page($tpl_name);
-
-    if (!may_update()) {
-        $page->kill("You have not sufficient credentials");
-    }
-
-    $page->useMenu();
-    $page->assign('asso', $globals->asso());
-    $page->setType($globals->asso('cat'));
-}
-
-// }}}
-// {{{ function new_admin_page()
-
-function new_admin_page($tpl_name)
-{
-    global $page, $globals;
-
-    new_page($tpl_name);
-
-    check_perms();
-
-    $page->useMenu();
-    if ($globals->asso('cat')) {
-        $page->assign('asso', $globals->asso());
-        $page->setType($globals->asso('cat'));
-    }
-}
-
-// }}}
-// {{{ function new_nonhtml_page()
-
-function new_nonhtml_page($tpl_name)
-{
-    global $page, $globals;
-
-    new_page($tpl_name, NO_SKIN);
-
-    $page->doAuth(true);
-    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'));
-}
-
-// }}}
-// 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:
 ?>