X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=207f137f0f33a2ad399c68207258a220b70c6202;hb=493b6abebf3d6c35691f66fd1bfdc063efaab576;hp=3b9519cbc378c74deaf01677c6c25be46826e5d0;hpb=b0b937fdb5cb3d4758d054ce9eb02d184f430ccc;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 3b9519c..207f137 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   *
@@ -18,57 +18,45 @@
  *  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();
+$globals = new PlatalGlobals('XorgSession');
 XorgSession::init();
 
-require_once('platal/page.inc.php');
-
 // {{{ class XorgPage
 
 class XorgPage extends PlatalPage
 {
-    function XorgPage($tpl, $type=SKINNED)
+    function XorgPage($tpl, $type = SKINNED)
     {
         $this->PlatalPage($tpl, $type);
     }
 
     function run()
     {
-        global $globals;
-        if ($this->_page_type != NO_SKIN) {
-            $this->assign('menu', $globals->menu->menu());
-        }
-        $this->_run('skin/'.S::v('skin'));
-    }
-
-    function doLogin($new_name = false)
-    {
-        global $page;
-        if (S::logged() and !$new_name) {
-            $page->changeTpl('password_prompt_logged.tpl');
-            $page->addJsLink('javascript/do_challenge_response_logged.js');
+        global $globals, $platal;
+        $this->assign('globals', $globals);
+        if (isset($platal) && $platal->path == 'register') {
+            $skin = 'register.tpl';
         } else {
-            $page->changeTpl('password_prompt.tpl');
-            $page->addJsLink('javascript/do_challenge_response.js');
-    	}
-        $page->run();
+            $skin = S::v('skin', 'default.tpl');
+        }
+        $this->_run('skin/' . $skin);
     }
 }
 
 // }}}
 // {{{ class XorgAdmin
 
-/** Une classe pour les pages réservées aux admins (authentifiés!).
+/** Une classe pour les pages réservées aux admins (authentifiés!).
  */
 class XorgAdmin extends XorgPage
 {
     // {{{ function XorgAdmin()
 
-    function XorgAdmin($tpl, $type=SKINNED)
+    function XorgAdmin($tpl, $type = SKINNED)
     {
         $this->XorgPage($tpl, $type);
         check_perms();
@@ -107,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:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>