X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fplatal.inc.php;h=3ab3e2b96a2dd36294ce6061c06a35bf232195d7;hb=66297a8c8e4104f27ad2b3db4e35dc3cc77aa6db;hp=e30429d9f323758d36fab339c9ffd02c2c2025c7;hpb=47fa97fed308292ab5e7bed6f870b39f55747aa8;p=platal.git

diff --git a/include/platal.inc.php b/include/platal.inc.php
index e30429d..3ab3e2b 100644
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -21,6 +21,9 @@
 
 $TIME_BEGIN = microtime(true);
 
+require_once dirname(__FILE__) . '/version.inc.php';
+require_once dirname(__FILE__) . '/misc.inc.php';
+
 define('PERMS_EXT',   'ext');
 define('PERMS_USER',  'user');
 define('PERMS_ADMIN', 'admin');
@@ -33,28 +36,26 @@ define('NO_AUTH', 0);
 define('DO_AUTH', 1);
 define('NO_HTTPS', 2);
 
-define('DEBUG_BT', 1);
-define('DEBUG_VALID', 2);
-define('DEBUG_SMARTY', 4);
-
-function pl_autoload($cls)
+function pl_autoload($cls, array $pathes = array())
 {
     $cls  = strtolower($cls);
-    $path = dirname(dirname(__FILE__));
-    if (!@include "$path/classes/$cls.php") {
-        if (substr($cls, -3, 3) == 'req') {
-            @include 'validations.inc.php';
-            return;
-        } else if (substr($cls, 0, 6) == 'banana') {
-            require_once 'banana/banana.inc.php';
-            Banana::load(substr($cls, 6));
-            return;
+    $basepath = dirname(dirname(dirname(__FILE__)));
+
+    array_unshift($pathes, 'core/classes', 'classes');
+    foreach ($pathes as $path) {
+        if (@include_once "$basepath/$path/$cls.php") {
+            return true;
         }
-        @include "$cls.inc.php";
     }
+    return false;
 }
 pl_autoload('Env');
 
+function pl_core_include($file)
+{
+    return dirname(__FILE__) . '/' . $file;
+}
+
 function pl_error_handler($errno, $errstr, $errfile, $errline)
 {
     static $errortype;
@@ -103,12 +104,11 @@ function pl_clear_errors()
 function pl_dump_env()
 {
     echo "<div class='phperror'><pre>";
-    echo "\nSESSION: "; var_dump($_SESSION);
+    echo "\nSESSION: " . session_id(); var_dump($_SESSION);
     echo "\nPOST:    "; var_dump($_POST);
     echo "\nGET:     "; var_dump($_GET);
     echo "\nCOOKIE:  "; var_dump($_COOKIE);
     echo "</pre></div>";
-    pl_print_errors();
 }
 
 function pl_print_errors()
@@ -155,10 +155,8 @@ function pl_self($n = null) {
 
 function http_redirect($fullurl)
 {
-    if (count($_SESSION)) {
-        session_write_close();
-    }
-    header('Location: '.$fullurl);
+    Platal::session()->close();
+    header('Location: '. $fullurl);
     exit;
 }