X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhandler.php;h=796038fffbee1448d11e86b3621d54a13e4ee1fb;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=6daf6e476644d8bc4e10f7926991270de7c3949e;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/handler.php b/inc/handler.php
index 6daf6e4766..796038fffb 100644
--- 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 - 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 *
@@ -38,32 +32,39 @@
 
 // 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
-	$msg = 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
 	);
 
-	// 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 {
-		// 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]
 ?>