X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fhandler.php;h=40aecad99ec22f4cd0efb8bef00674591b11f771;hp=0d36f4990590d202c10555785f603b9b51d1caaa;hb=0ed9eaa5aea8db1f690a983a39ff4b2074faf6c5;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/handler.php b/inc/handler.php
index 0d36f49905..40aecad99e 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,20 +43,27 @@ 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
 	);
 
-	// Output message to user and die
-	debug_report_bug($errfile, $errline, $message);
+	// Is HTML output mode?
+	if (isHtmlOutputMode()) {
+		// Output message to user and exit
+		reportBug($errfile, $errline, $message);
+	} else {
+		// Log error message
+		logDebugMessage($errfile, $errline, $message);
+	}
 }
 
 // Init error handler
 function initErrorHandler () {
-	enableExitOnError(false);
+	enableExitOnError(FALSE);
 }
 
 // Enable exit on error