X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Fxorg.php;h=e43ef73fa9c06ffcb22a70250c04ab1646cf83b9;hb=a9cd2babbdceaeb57e9de04ce0e7113a14926ec1;hp=f0faa4e4d504d0420b10813d206aa63960bfc5b3;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git

diff --git a/htdocs/xorg.php b/htdocs/xorg.php
index f0faa4e..e43ef73 100644
--- a/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@ -20,23 +20,21 @@
  ***************************************************************************/
 
 require_once dirname(__FILE__).'/../include/xorg.inc.php';
-global $globals, $platal, $page;
 
-if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
+$platal = new Xorg('auth', 'carnet', 'email', 'events', 'forums',
+                   'geoloc', 'lists', 'marketing', 'payment', 'platal',
+                   'profile', 'register', 'search', 'stats', 'admin',
+                   'newsletter', 'axletter', 'bandeau', 'survey',
+                   'gadgets', 'googleapps');
 
-    $platal = new Platal('auth', 'banana', 'carnet', 'email', 'events',
-                         'geoloc', 'lists', 'marketing', 'payment', 'platal',
-                         'profile', 'register', 'search', 'stats', 'admin',
-                         'newsletter', 'axletter', 'bandeau', 'survey',
-                         'gadgets');
+if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
     $platal->run();
-
     exit;
 }
 
 /*** WIKI CODE ***/
 
-include 'wiki/engine.php';
+include pl_core_include('wiki.engine.inc.php');
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>