tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlanthaler: Don't show a error message and don't quit the script when the error was expected (statement with an @ in front to suppress the error). (merged from branches/gsoc) 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41730 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-14 03:19:34 +00:00
parent a377a67e54
commit daca02b9a7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/Debug.php
View File

@ -57,7 +57,7 @@ class Debug {
$result .= "<li>$k = " . Debug::text($v) . "</li>\n";
}
$val = $result . "</ul>\n";
} else if (is_object($val)) {
$val = var_export($val, true);
} else {
@ -69,7 +69,7 @@ class Debug {
return $val;
}
}
/**
* Show a debugging message
*/
@ -82,33 +82,35 @@ class Debug {
echo Convert::raw2xml(trim($message)) . "</p>\n";
}
}
/**
* Load an error handler
*/
static function loadErrorHandlers() {
Debug::loadFatalErrorHandler();
}
static function loadFatalErrorHandler() {
set_error_handler('errorHandler', E_ALL & ~E_NOTICE);
}
static function warningHandler($errno, $errstr, $errfile, $errline, $errcontext) {
if(self::$send_warnings_to) self::emailError(self::$send_warnings_to, $errno, $errstr, $errfile, $errline, $errcontext, "Warning");
if(Director::isDev()) {
self::showError($errno, $errstr, $errfile, $errline, $errcontext);
die();
if(error_reporting() != 0) { // otherwise the error was suppressed with @
self::showError($errno, $errstr, $errfile, $errline, $errcontext);
die();
}
}
}
static function fatalHandler($errno, $errstr, $errfile, $errline, $errcontext) {
if(self::$send_errors_to) self::emailError(self::$send_errors_to, $errno, $errstr, $errfile, $errline, $errcontext, "Error");
if(Director::isDev()) {
Debug::showError($errno, $errstr, $errfile, $errline, $errcontext);
} else {
Debug::friendlyError($errno, $errstr, $errfile, $errline, $errcontext);
}
@ -119,7 +121,7 @@ class Debug {
if(Director::is_ajax()) {
echo "ERROR:There has been an error";
} else {
if(file_exists('../assets/error-500.html')) {
echo "ERROR:";
@ -136,27 +138,27 @@ class Debug {
if(Director::is_ajax()) {
echo "ERROR:Error $errno: $errstr\n At l$errline in $errfile\n";
Debug::backtrace();
} else {
echo "<div style=\"border: 5px red solid\">\n";
echo "<p style=\"color: white; background-color: red; margin: 0\">FATAL ERROR: $errstr<br />\n At line $errline in $errfile<br />\n<br />\n</p>\n";
Debug::backtrace();
echo "<h2>Context</h2>\n";
Debug::show($errcontext);
echo "</div>\n";
}
}
static function emailError($emailAddress, $errno, $errstr, $errfile, $errline, $errcontext, $errorType = "Error") {
if(strtolower($errorType) == 'warning') {
$colour = "orange";
} else {
$colour = "red";
}
$data = "<div style=\"border: 5px $colour solid\">\n";
$data .= "<p style=\"color: white; background-color: $colour; margin: 0\">$errorType: $errstr<br /> At line $errline in $errfile\n<br />\n<br />\n</p>\n";