X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=0d4274c64adf087ebf6fc0527009a374a573b69b;hb=68ef4e7d2c4d1bfd08e59d6118047044530c4ae2;hp=cb86440297863669ad9bb9f7da4528340b87c10d;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index cb86440..0d4274c 100644
--- a/include/xorg.inc.php
+++ b/include/xorg.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   *
@@ -18,93 +18,49 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
+
 require_once('platal.inc.php');
-require_once('xorg/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
-XorgGlobals::init();
-XorgGlobals::setlocale();
-XorgSession::init();
+$globals = new PlatalGlobals('XorgSession');
+$globals->bootstrap(array('NbIns'), 'update_NbIns');
+$globals->bootstrap(array('NbValid'), 'update_NbValid');
 
-// {{{ function _new_page()
+// {{{ class XorgPage
 
-function _new_page($type, $tpl_name, $min_auth, $admin=false)
+class XorgPage extends PlatalPage
 {
-    global $page, $globals;
-    require_once("xorg/page.inc.php");
-    if ($min_auth == AUTH_PUBLIC && Env::get('force_login') == '1')
-        $min_auth = AUTH_COOKIE;
-    if (!empty($admin)) {
-        $page = new XorgAdmin($tpl_name, $type);
-    } else switch($min_auth) {
-        case AUTH_PUBLIC:
-            $page = new XorgPage($tpl_name, $type);
-            break;
-
-        case AUTH_COOKIE:
-            $page = new XorgCookie($tpl_name, $type);
-            break;
-
-        case AUTH_MDP:
-            $page = new XorgAuth($tpl_name, $type);
+    public function __construct($tpl, $type = SKINNED)
+    {
+        parent::__construct($tpl, $type);
     }
 
-    $page->assign('xorg_tpl', $tpl_name);
+    public function run()
+    {
+        global $globals, $platal;
+        $this->assign('globals', $globals);
+        if (isset($platal) && $platal->path == 'register') {
+            $skin = $globals->register_skin . ".tpl";
+        } else {
+            $skin = S::v('skin', $globals->skin . ".tpl");
+        }
+        $this->_run('skin/' . $skin);
+    }
 }
 
-// }}}
-function new_identification_page()
-{
-    _new_page(SKINNED, '', AUTH_MDP);
-}
 // {{{ function new_skinned_page()
 
-function new_skinned_page($tpl_name, $min_auth)
-{
-    _new_page(SKINNED, $tpl_name, $min_auth);
-}
-
-// }}}
-// {{{ function new_simple_page()
-
-function new_simple_page($tpl_name, $min_auth)
+function new_skinned_page($tpl_name)
 {
     global $page;
-    _new_page(SKINNED, $tpl_name, $min_auth);
-    $page->assign('simple', true);
-}
-
-// }}}
-// {{{ function new_nonhtml_page()
-
-function new_nonhtml_page($tpl_name, $min_auth)
-{
-    _new_page(NO_SKIN, $tpl_name, $min_auth, false);
-}
-
-// }}}
-// {{{ function new_admin_page()
-
-function new_admin_page($tpl_name)
-{
-    _new_page(SKINNED, $tpl_name, AUTH_MDP, true);
-}
-
-// }}}
-// {{{ function new_admin_table_editor()
-
-function new_admin_table_editor($table, $idfield, $idedit=false)
-{
-    array_walk($_GET, 'unfix_gpc_magic');
-    array_walk($_POST, 'unfix_gpc_magic');
-    array_walk($_REQUEST, 'unfix_gpc_magic');
-
-    global $editor;
-    new_admin_page('table-editor.tpl');
-    require_once('xorg.table-editor.inc.php');
-    $editor = new XOrgAdminTableEditor($table,$idfield,$idedit);
+    if (!$page instanceof XorgPage) {
+        $page = new XorgPage($tpl_name);
+    } else {
+        $page->changeTpl($tpl_name);
+    }
 }
 
-// }}}
+XorgSession::init();
 
-// 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:
 ?>