merge xmlrpc stuff, and put it in classes/

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

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 3b9519c..3d84c05 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -18,6 +18,7 @@
  *  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('xorg/session.inc.php');
@@ -25,13 +26,13 @@ XorgGlobals::init();
 XorgGlobals::setlocale();
 XorgSession::init();
 
-require_once('platal/page.inc.php');
+require_once dirname(__FILE__).'/../classes/Page.php';
 
 // {{{ class XorgPage
 
 class XorgPage extends PlatalPage
 {
-    function XorgPage($tpl, $type=SKINNED)
+    function XorgPage($tpl, $type = SKINNED)
     {
         $this->PlatalPage($tpl, $type);
     }
@@ -39,23 +40,8 @@ class XorgPage extends PlatalPage
     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');
-        } else {
-            $page->changeTpl('password_prompt.tpl');
-            $page->addJsLink('javascript/do_challenge_response.js');
-       }
-        $page->run();
+        $this->assign('globals', $globals);
+        $this->_run('skin/'.S::v('skin', 'default.tpl'));
     }
 }
 
@@ -68,7 +54,7 @@ class XorgAdmin extends XorgPage
 {
     // {{{ function XorgAdmin()
 
-    function XorgAdmin($tpl, $type=SKINNED)
+    function XorgAdmin($tpl, $type = SKINNED)
     {
         $this->XorgPage($tpl, $type);
         check_perms();