Rewrote some parts:

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index 6daf6e476644d8bc4e10f7926991270de7c3949e..7a4aa53c877348dab1969a799437115eae2e75d9 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
 <?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                                      *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * 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 *


@@ -38,32 +37,39 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
 
 // 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
 }
 
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
        // Construct message

-       $msg = 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
        );
 

-       // Write debug log message
-       DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true);
-
-       // Output message to user and die
-       if (EXT_IS_ACTIVE("debug")) {
-               // Debug extension found! So Output a small message
-               mxchange_die("Error message written to debug.log. Please try to call <a href=\"{!URL!}\">the main page</a> to continue.");
+       // Is HTML output mode?
+       if (isHtmlOutputMode()) {
+               // Output message to user and exit
+               reportBug($errfile, $errline, $message);

        } else {
        } else {

-               // No debug extension found, so regular output
-               debug_report_bug($msg);
+               // Log error message
+               logDebugMessage($errfile, $errline, $message);

        }
 }
 
        }
 }
 

+// Init error handler
+function initErrorHandler () {
+       enableExitOnError(FALSE);
+}
+
+// Enable exit on error
+function enableExitOnError ($enable=true) {
+       $GLOBALS['error_handler']['exit_on_error'] = $enable;
+}
+

 // [EOF]
 ?>
 // [EOF]
 ?>