Rewrote some parts:

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index 8aa40ee08f7bb5446092fc257a6cd1812fb241c4..7a4aa53c877348dab1969a799437115eae2e75d9 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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
-       reportBug($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