Merge commit 'origin/master' into account

[platal.git] / htdocs / xorg.php

diff --git a/htdocs/xorg.php b/htdocs/xorg.php
index 93226b9..3c27ba2 100644 (file)
--- a/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,23 +20,22 @@
  ***************************************************************************/
 
 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',
+                   'lists', 'marketing', 'payment', 'platal',
+                   'profile', 'register', 'search', 'stats', 'admin',
+                   'newsletter', 'axletter', 'bandeau', 'survey',
+                   'fusionax', 'gadgets', 'googleapps', 'poison',
+                   'openid', 'reminder');
 
-    $platal = new Platal('auth', 'carnet', 'email', 'events', 'forums',
-                         'geoloc', 'lists', 'marketing', 'payment', 'platal',
-                         'profile', 'register', 'search', 'stats', 'admin',
-                         'newsletter', 'axletter', 'bandeau', 'survey',
-                         'gadgets', 'googleapps');
+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:
 ?>