Introduced new extension ext-blacklist:

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index 8aa40ee08f7bb5446092fc257a6cd1812fb241c4..40aecad99ec22f4cd0efb8bef00674591b11f771 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -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