Continued a bit:

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index 1c28ca893f87bd82be84240467f1bb38142d69ab..d21b68aa2e4518e481a44ac3cedcd030ddbb15cc 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/28/2009 *
- * ===============                              Last change: 02/28/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 02/28/2009 *
+ * ===================                          Last change: 02/28/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : handler.php                                      *
@@ -10,15 +10,9 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Handler-Funktionen (Call-Back)                   *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2016 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 *
@@ -38,31 +32,37 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+       die();
 }
 
 // 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($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
-function enableExitOnError ($enable=true) {
+function enableExitOnError ($enable = TRUE) {
        $GLOBALS['error_handler']['exit_on_error'] = $enable;
 }