X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=97c8a037e175e75f9624925d2cb33ae6bbf4f66b;hb=7192cdc512c54b21c71c9fc879a5ce39716ffa75;hp=209de7cd253052a163ba3ad5197a921412aae6eb;hpb=801fcad813666310da1ca5b6f07f91cfed1abbee;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 209de7c..97c8a03 100644
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -18,39 +18,28 @@
  *  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()
-
-    function XorgPage($tpl, $type=SKINNED)
+    function XorgPage($tpl, $type = SKINNED)
     {
         $this->PlatalPage($tpl, $type);
     }
 
-    // }}}
-    // {{{ function run()
-
     function run()
     {
         global $globals;
-        if ($this->_page_type != NO_SKIN) {
-            $this->assign('menu', $globals->menu->menu());
-        }
-        $this->_run('skin/'.S::v('skin'));
+        $this->assign('globals', $globals);
+        $this->_run('skin/'.S::v('skin', 'default.tpl'));
     }
-
-    // }}}
 }
 
 // }}}
@@ -62,7 +51,7 @@ class XorgAdmin extends XorgPage
 {
     // {{{ function XorgAdmin()
 
-    function XorgAdmin($tpl, $type=SKINNED)
+    function XorgAdmin($tpl, $type = SKINNED)
     {
         $this->XorgPage($tpl, $type);
         check_perms();
@@ -101,21 +90,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:
 ?>