X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fplatal.inc.php;h=0f1842993da251983fa29276b4b04758028e942d;hb=e92ecb8c24421ca1dd4f87ad7478d0d8277e1f60;hp=7b491c806e7bf88588e636c8356c969813c082c5;hpb=cd1d4b4fe272a49f0d1c1ae84bf2a6b432979f09;p=platal.git
diff --git a/include/platal.inc.php b/include/platal.inc.php
index 7b491c8..0f18429 100644
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -1,6 +1,6 @@
".
- "{$type} $errstr
".
- "$errfile : $errline".
- "";
- }
-}
+ $error = strpos($type, 'Warning') !== false || strpos($type, 'Error') !==false;
-function pl_clear_errors()
-{
- unset($GLOBALS['pl_errors']);
+ pl_autoload('PlBacktrace');
+ if (!isset(PlBacktrace::$bt['PHP Errors'])) {
+ new PlBacktrace('PHP Errors');
+ }
+ PlBacktrace::$bt['PHP Errors']->newEvent("$type: $errstr",
+ 0, $error ? $errstr : null,
+ array(array('file' => $errfile,
+ 'line' => $errline)));
}
function pl_dump_env()
@@ -120,15 +127,27 @@ function pl_dump_env()
echo "";
}
-function pl_print_errors()
+function pl_print_errors($html = false)
{
- if (!empty($GLOBALS['pl_errors'])) {
- print join("\n", $GLOBALS['pl_errors']);
+ if (!isset(PlBacktrace::$bt['PHP Errors'])) {
+ return;
+ }
+ foreach (PlBacktrace::$bt['PHP Errors']->traces as $trace) {
+ if ($html) {
+ echo "
"; + } + print "{$trace['action']}\n"; + print " {$trace['data'][0]['file']}: {$trace['data'][0]['line']}\n"; + if ($html) { + echo ""; + } } } set_error_handler('pl_error_handler', E_ALL | E_STRICT); -register_shutdown_function('pl_print_errors'); +if (php_sapi_name() == 'cli') { + register_shutdown_function('pl_print_errors'); +} //register_shutdown_function('pl_dump_env'); /** Check if the string is utf8