X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fplatal.inc.php;h=652dc92ae3a3018feef6e9cdf9bccbac92c385ea;hb=b0a04fb238a94f6ca3cdc874bbc1093915cd0fe2;hp=b7142d4eddc74f7fd333174a526eb311b1663c94;hpb=0f384dd35da31e9c1224f73df683b297c560b873;p=platal.git diff --git a/include/platal.inc.php b/include/platal.inc.php index b7142d4..652dc92 100644 --- a/include/platal.inc.php +++ b/include/platal.inc.php @@ -1,6 +1,6 @@ "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" - ); + if (!isset($errortype)) { + $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", + E_RECOVERABLE_ERROR => "Recoverable Error" + ); + } global $globals; if (isset($globals) && !$globals->debug) { - if (strpos($errortype[$errno], 'Notice') !== false) { + if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) { return; } } + $type = isset($errortype[$errno]) ? $errortype[$errno] : $errno; $errstr = utf8_encode(htmlentities($errstr)); $GLOBALS['pl_errors'][] = "
"; - echo "\nSESSION: "; var_export($_SESSION); - echo "\nPOST: "; var_export($_POST); - echo "\nGET: "; var_export($_GET); - echo "\nCOOKIE: "; var_export($_COOKIE); + echo "\nSESSION: " . session_id(); var_dump($_SESSION); + echo "\nPOST: "; var_dump($_POST); + echo "\nGET: "; var_dump($_GET); + echo "\nCOOKIE: "; var_dump($_COOKIE); echo "