X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhandler.php;h=9523a6eb69f91b11e96ec74f3f41946e6f41f433;hb=82c5c7d37ee00f628b4fdd445f7fc453523ed1dd;hp=fe9149c99e20232393e4de3ed929e24c2e5761ec;hpb=0cc73bd7020ca53d7e296b9f5842331fb0d54cb1;p=mailer.git

diff --git a/inc/handler.php b/inc/handler.php
index fe9149c99e..9523a6eb69 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Handler-Funktionen (Call-Back)                   *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,24 +38,22 @@ if (!defined('__SECURITY')) {
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
 	// Construct message
-	$message = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
+	$message = sprintf('errno=%s(0x%s),errstr=%s,errfile=%s,errline=%s',
 		$errno,
+		getHexErrorCode($errno),
 		$errstr,
 		basename($errfile),
 		$errline
 	);
 
-	// Is installation phase?
-	if (isInstallationPhase()) {
+	// Is HTML output mode?
+	if (isHtmlOutputMode()) {
+		// Output message to user and exit
+		reportBug($errfile, $errline, $message);
+	} else {
 		// Log error message
 		logDebugMessage($errfile, $errline, $message);
-	} else {
-		// Output message to user and die
-		reportBug($errfile, $errline, $message);
 	}
-
-	// Always return false
-	return FALSE;
 }
 
 // Init error handler
@@ -69,7 +62,7 @@ function initErrorHandler () {
 }
 
 // Enable exit on error
-function enableExitOnError ($enable=true) {
+function enableExitOnError ($enable = TRUE) {
 	$GLOBALS['error_handler']['exit_on_error'] = $enable;
 }