X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=8f548f9f0f3ca8aeded61e0b4b91e541f472bd2d;hb=323e53dc4e0b4d0a65182b179fd27880de0c3ff7;hp=3d84c0576bd5df120a517a94f0dd3862e82f6189;hpb=b76f079747fde07b41b89b22c4d08fe835d04052;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 3d84c05..8f548f9 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-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,14 +20,11 @@
  ***************************************************************************/
 
 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();
+$globals = new PlatalGlobals('XorgSession');
 XorgSession::init();
 
-require_once dirname(__FILE__).'/../classes/Page.php';
-
 // {{{ class XorgPage
 
 class XorgPage extends PlatalPage
@@ -39,9 +36,14 @@ class XorgPage extends PlatalPage
 
     function run()
     {
-        global $globals;
+        global $globals, $platal;
         $this->assign('globals', $globals);
-        $this->_run('skin/'.S::v('skin', 'default.tpl'));
+        if ($platal->path == 'register') {
+            $skin = 'register.tpl';
+        } else {
+            $skin = S::v('skin', 'default.tpl');
+        }
+        $this->_run('skin/' . $skin);
     }
 }
 
@@ -93,21 +95,6 @@ function new_admin_page($tpl_name)
 }
 
 // }}}
-// {{{ 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);
-}
-
-// }}}
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>