diff options
Diffstat (limited to 'core/ErrorHandler.php')
| -rw-r--r-- | core/ErrorHandler.php | 127 |
1 files changed, 60 insertions, 67 deletions
diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php index cfb342babb..f2bcde168c 100644 --- a/core/ErrorHandler.php +++ b/core/ErrorHandler.php @@ -1,10 +1,10 @@ <?php /** * Piwik - Open source web analytics - * + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * + * * @category Piwik * @package Piwik */ @@ -12,75 +12,68 @@ /** * Error handler used to display nicely errors in Piwik * - * @param int $errno Error number - * @param string $errstr Error message - * @param string $errfile File name - * @param int $errline Line number + * @param int $errno Error number + * @param string $errstr Error message + * @param string $errfile File name + * @param int $errline Line number * @return void */ function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline) { - // if the error has been suppressed by the @ we don't handle the error - if( error_reporting() == 0 ) - { - return; - } + // if the error has been suppressed by the @ we don't handle the error + if (error_reporting() == 0) { + return; + } + + if (function_exists('debug_backtrace')) { + $backtrace = ''; + $bt = @debug_backtrace(); + if ($bt !== null && isset($bt[0])) { + foreach ($bt as $i => $debug) { + $backtrace .= "#$i " + . (isset($debug['class']) ? $debug['class'] : '') + . (isset($debug['type']) ? $debug['type'] : '') + . (isset($debug['function']) ? $debug['function'] : '') + . '(...) called at [' + . (isset($debug['file']) ? $debug['file'] : '') . ':' + . (isset($debug['line']) ? $debug['line'] : '') . ']' . "\n"; + } + } + } else { + ob_start(); + @debug_print_backtrace(); + $backtrace = ob_get_contents(); + ob_end_clean(); + } - if(function_exists('debug_backtrace')) - { - $backtrace = ''; - $bt = @debug_backtrace(); - if($bt !== null && isset($bt[0])) - { - foreach($bt as $i => $debug) - { - $backtrace .= "#$i " - .(isset($debug['class']) ? $debug['class'] : '') - .(isset($debug['type']) ? $debug['type'] : '') - .(isset($debug['function']) ? $debug['function'] : '') - .'(...) called at [' - .(isset($debug['file']) ? $debug['file'] : '').':' - .(isset($debug['line']) ? $debug['line'] : '').']'."\n"; - } - } - } - else - { - ob_start(); - @debug_print_backtrace(); - $backtrace = ob_get_contents(); - ob_end_clean(); - } + try { + Zend_Registry::get('logger_error')->logEvent($errno, $errstr, $errfile, $errline, $backtrace); + } catch (Exception $e) { + // in case the error occurs before the logger creation, we simply display it + print("<pre>$errstr \nin '$errfile' at the line $errline\n\n$backtrace\n</pre>"); + exit; + } + switch ($errno) { + case E_ERROR: + case E_PARSE: + case E_CORE_ERROR: + case E_CORE_WARNING: + case E_COMPILE_ERROR: + case E_COMPILE_WARNING: + case E_USER_ERROR: + exit; + break; - try { - Zend_Registry::get('logger_error')->logEvent($errno, $errstr, $errfile, $errline, $backtrace); - } catch(Exception $e) { - // in case the error occurs before the logger creation, we simply display it - print("<pre>$errstr \nin '$errfile' at the line $errline\n\n$backtrace\n</pre>"); - exit; - } - switch($errno) - { - case E_ERROR: - case E_PARSE: - case E_CORE_ERROR: - case E_CORE_WARNING: - case E_COMPILE_ERROR: - case E_COMPILE_WARNING: - case E_USER_ERROR: - exit; - break; - - case E_WARNING: - case E_NOTICE: - case E_USER_WARNING: - case E_USER_NOTICE: - case E_STRICT: - case E_RECOVERABLE_ERROR: - case E_DEPRECATED: - case E_USER_DEPRECATED: - default: - // do not exit - break; - } + case E_WARNING: + case E_NOTICE: + case E_USER_WARNING: + case E_USER_NOTICE: + case E_STRICT: + case E_RECOVERABLE_ERROR: + case E_DEPRECATED: + case E_USER_DEPRECATED: + default: + // do not exit + break; + } } |