X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=e0ca4bb4aeb1b8603ba7f03887f9df9b1ea08c99;hb=a011bedd38f49c5a220cc3332692c9bdff33d3b7;hp=5aea1870fb0c3600b4c3971fc58a90e8908ddcef;hpb=2b1ee50b0196216dbe4f37e3b039469d6003ca23;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 5aea187..e0ca4bb 100644
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -23,7 +23,6 @@ require_once('platal.inc.php');
 require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
 $globals = new PlatalGlobals('XorgSession');
-XorgSession::init();
 
 // {{{ class XorgPage
 
@@ -39,44 +38,27 @@ class XorgPage extends PlatalPage
         global $globals, $platal;
         $this->assign('globals', $globals);
         if (isset($platal) && $platal->path == 'register') {
-            $skin = 'register.tpl';
+            $skin = $globals->register_skin . ".tpl";
         } else {
-            $skin = S::v('skin', 'default.tpl');
+            $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 enc=utf-8:
 ?>