X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=e0ca4bb4aeb1b8603ba7f03887f9df9b1ea08c99;hb=028726d48c0dae158cc947971992ce1e8e7dfb11;hp=b473e1ff28f73b0e92e2578079a10d2b94a0d26e;hpb=ea6398d17ff92793b0a76d6fffc88147bb40a203;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index b473e1f..e0ca4bb 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,78 +20,45 @@
  ***************************************************************************/
 
 require_once('platal.inc.php');
-require_once('platal/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
 $globals = new PlatalGlobals('XorgSession');
-XorgSession::init();
-
-require_once dirname(__FILE__).'/../classes/Page.php';
 
 // {{{ class XorgPage
 
 class XorgPage extends PlatalPage
 {
-    function XorgPage($tpl, $type = SKINNED)
+    public function __construct($tpl, $type = SKINNED)
     {
-        $this->PlatalPage($tpl, $type);
+        parent::__construct($tpl, $type);
     }
 
-    function run()
+    public function run()
     {
-        global $globals;
+        global $globals, $platal;
         $this->assign('globals', $globals);
-        $this->_run('skin/'.S::v('skin', 'default.tpl'));
-    }
-}
-
-// }}}
-// {{{ class XorgAdmin
-
-/** Une classe pour les pages réservées aux admins (authentifiés!).
- */
-class XorgAdmin extends XorgPage
-{
-    // {{{ function XorgAdmin()
-
-    function XorgAdmin($tpl, $type = SKINNED)
-    {
-        $this->XorgPage($tpl, $type);
-        check_perms();
+        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_skinned_page()
 
-function _new_page($type, $tpl_name, $admin=false)
+function new_skinned_page($tpl_name)
 {
     global $page;
-    if (!empty($admin)) {
-        $page = new XorgAdmin($tpl_name, $type);
+    if (!$page instanceof XorgPage) {
+        $page = new XorgPage($tpl_name);
     } else {
-        $page = new XorgPage($tpl_name, $type);
+        $page->changeTpl($tpl_name);
     }
-
-    $page->assign('xorg_tpl', $tpl_name);
-}
-
-// {{{ function new_skinned_page()
-
-function new_skinned_page($tpl_name)
-{
-    _new_page(SKINNED, $tpl_name);
-}
-
-// }}}
-// {{{ function new_admin_page()
-
-function new_admin_page($tpl_name)
-{
-    _new_page(SKINNED, $tpl_name, true);
 }
 
-// }}}
+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:
 ?>