X.net built on new Core schema.

[platal.git] / include / xorg.inc.php

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 62bfbe8..5f7af96 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,45 +19,38 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
+define('PL_GLOBALS_CLASS', 'PlatalGlobals');
+define('PL_SESSION_CLASS', 'XorgSession');
+define('PL_PAGE_CLASS', 'XorgPage');
+
 require_once('platal.inc.php');
 require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
-$globals = new PlatalGlobals('XorgSession');
-XorgSession::init();
 
 // {{{ class XorgPage
 
-class XorgPage extends PlatalPage
+class XorgPage extends PlPage
 {
-    public function __construct($tpl, $type = SKINNED)
+    public function __construct()
     {
-        parent::__construct($tpl, $type);
+        parent::__construct();
+
+        // Set the default page
+        $this->changeTpl('platal/index.tpl');
     }
 
     public function run()
     {
         global $globals, $platal;
-        $this->assign('globals', $globals);
+        $this->assign_by_ref('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_skinned_page($tpl_name)
-{
-    global $page;
-    if (!$page instanceof XorgPage) {
-        $page = new XorgPage($tpl_name);
-    } else {
-        $page->changeTpl($tpl_name);
-    }
-}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>