X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fplatal.inc.php;h=42e776a3c571b17035edda041d1ff3d327f9e625;hb=1af8f55d45abf04bc0cf1a8ae368ac7f82215192;hp=a24d16e2097c0512fc31276ead7c0f78e132b080;hpb=d90fe33c20386e830e01f5a93ea6773979be5827;p=platal.git

diff --git a/include/platal.inc.php b/include/platal.inc.php
index a24d16e..42e776a 100644
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 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,42 +19,125 @@
  *  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);
 
-// {{{ defines
+define('AUTH_PUBLIC', 0);
+define('AUTH_COOKIE', 1);
+define('AUTH_MDP',    2);
 
-$i=0;
-define("AUTH_PUBLIC", $i++);
-define("AUTH_COOKIE", $i++);
-define("AUTH_MDP", $i++);
-
-define("PERMS_EXT", "ext");
-define("PERMS_USER", "user");
-define("PERMS_ADMIN", "admin");
+define('PERMS_EXT',   'ext');
+define('PERMS_USER',  'user');
+define('PERMS_ADMIN', 'admin');
 
 define('SKINNED', 0);
-define('NO_SKIN', 1);
+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';
+}
+__autoload('Env');
+
+function pl_error_handler($errno, $errstr, $errfile, $errline)
+{
+    if (!error_reporting())
+        return;
+
+    $errortype = array (
+        E_ERROR           => "Error",
+        E_WARNING         => "Warning",
+        E_PARSE           => "Parsing Error",
+        E_NOTICE          => "Notice",
+        E_CORE_ERROR      => "Core Error",
+        E_CORE_WARNING    => "Core Warning",
+        E_COMPILE_ERROR   => "Compile Error",
+        E_COMPILE_WARNING => "Compile Warning",
+        E_USER_ERROR      => "User Error",
+        E_USER_WARNING    => "User Warning",
+        E_USER_NOTICE     => "User Notice",
+        E_STRICT          => "Runtime Notice"
+    );
+
+    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 />".
+        "<tt>$errfile : $errline</tt>".
+        "</div>";
+}
+
+function pl_clear_errors()
+{
+    unset($GLOBALS['pl_errors']);
+}
+
+function pl_dump_env()
+{
+    echo "<div class='phperror'><pre>";
+    echo "\nSESSION: "; var_export($_SESSION);
+    echo "\nPOST:    "; var_export($_POST);
+    echo "\nGET:     "; var_export($_GET);
+    echo "\nCOOKIE:  "; var_export($_COOKIE);
+    echo "</pre></div>";
+}
 
-require_once('platal/env.inc.php');
+function pl_print_errors()
+{
+    print join("\n", $GLOBALS['pl_errors']);
+}
 
-// }}}
-// {{{ function redirect
+set_error_handler('pl_error_handler', E_ALL | E_STRICT);
+register_shutdown_function('pl_print_errors');
+// register_shutdown_function('pl_dump_env');
+
+function pl_url($path, $query = null, $fragment = null)
+{
+    global $platal;
+
+    $base = $platal->ns . $path . ($query ? '?'.$query : '');
+    return $fragment ? $base.'#'.$fragment : $base;
+}
+
+function pl_self($n = null) {
+    global $platal;
+    return $platal->pl_self($n);
+}
 
-function redirect($page)
+function http_redirect($fullurl)
 {
     if (count($_SESSION)) {
         session_write_close();
     }
-    header("Location: $page");
+    header('Location: '.$fullurl);
     exit;
 }
 
-// }}}
+function pl_redirect($path, $query = null, $fragment = null)
+{
+    global $globals;
+    http_redirect($globals->baseurl . '/' . pl_url($path, $query, $fragment));
+}
+
+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:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>