Rewrote some parts:

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index 9096a5beef801a03e8da5a25f63170a899423455..7a4aa53c877348dab1969a799437115eae2e75d9 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *

- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *

  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *

- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
  *                                                                      *
  * 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 *


@@ -44,20 +43,27 @@ if (!defined('__SECURITY')) {
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
        // Construct message
 // 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,
                $errno,

+               getHexErrorCode($errno),

                $errstr,
                basename($errfile),
                $errline
        );
 
                $errstr,
                basename($errfile),
                $errline
        );
 

-       // Output message to user and die
-       debug_report_bug($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 () {
 }
 
 // Init error handler
 function initErrorHandler () {

-       enableExitOnError(false);
+       enableExitOnError(FALSE);

 }
 
 // Enable exit on error
 }
 
 // Enable exit on error