X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fplatal.inc.php;h=8b0b211f142f36e63b48a92411e0d3619c3d8078;hb=d36e55a1b669fb99a248a5032659bfe67948f84c;hp=e1891fd455049e89070f37475b1f9e9df8f8707c;hpb=6fb4b6fe07db62046d817cc76e0f1db2bd9afdd2;p=platal.git

diff --git a/include/platal.inc.php b/include/platal.inc.php
index e1891fd..8b0b211 100644
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,12 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-function microtime_float()
-{
-    list($usec, $sec) = explode(' ', microtime());
-    return ((float)$usec + (float)$sec);
-}
-$TIME_BEGIN = microtime_float();
+$TIME_BEGIN = microtime(true);
 
 define('AUTH_PUBLIC', 0);
 define('AUTH_COOKIE', 1);
@@ -38,9 +33,20 @@ define('SKINNED', 0);
 define('SIMPLE',  1);
 define('NO_SKIN', 2);
 
+define('NO_AUTH', 0);
+define('DO_AUTH', 1);
+
 function __autoload($cls)
 {
-    @include dirname(dirname(__FILE__)).'/classes/'.strtolower($cls).'.php';
+    $cls  = strtolower($cls);
+    $path = dirname(dirname(__FILE__));
+    if (!@include "$path/classes/$cls.php") {
+        if (substr($cls, -1, 3) == 'req') {
+            @include 'validations.inc.php';
+            return;
+        }
+        @include "$cls.inc.php";
+    }
 }
 __autoload('Env');
 
@@ -64,7 +70,14 @@ function pl_error_handler($errno, $errstr, $errfile, $errline)
         E_STRICT          => "Runtime Notice"
     );
 
-    $errstr = htmlentities($errstr);
+    global $globals;
+    if (isset($globals) && !$globals->debug) {
+        if (strpos($errortype[$errno], 'Notice') !== false) {
+            return;
+        }
+    }
+
+    $errstr = utf8_encode(htmlentities($errstr));
     $GLOBALS['pl_errors'][] =
         "<div class='phperror'>".
         "<strong>{$errortype[$errno]}</strong> <em>$errstr</em><br />".
@@ -72,6 +85,11 @@ function pl_error_handler($errno, $errstr, $errfile, $errline)
         "</div>";
 }
 
+function pl_clear_errors()
+{
+    unset($GLOBALS['pl_errors']);
+}
+
 function pl_dump_env()
 {
     echo "<div class='phperror'><pre>";
@@ -119,5 +137,15 @@ function pl_redirect($path, $query = null, $fragment = null)
     http_redirect($globals->baseurl . '/' . pl_url($path, $query, $fragment));
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+function pl_entities($text, $mode = ENT_COMPAT)
+{
+    return htmlentities($text, $mode, 'UTF-8');
+}
+
+function pl_entity_decode($text, $mode = ENT_COMPAT)
+{
+    return html_entity_decode($text, $mode, 'UTF-8');
+}
+
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>