X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhandler.php;h=344b88a6f0e7c3aaca029d736850c441cda662aa;hb=06a24901c58897845bafc1e5b428fee99024bc64;hp=f68a62d8755f03469ef6fa71d4304eb24060f3f3;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git

diff --git a/inc/handler.php b/inc/handler.php
index f68a62d875..344b88a6f0 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Handler-Funktionen (Call-Back)                   *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -38,14 +38,14 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // 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,errstr=%s,errfile=%s,errline=%s",
 		$errno,
 		$errstr,
 		basename($errfile),
@@ -53,17 +53,27 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
 	);
 
 	// Write debug log message
-	DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true);
+	DEBUG_LOG($errfile, $errline, $message, true);
 
 	// Output message to user and die
-	if (EXT_IS_ACTIVE("debug")) {
+	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.");
-	} else {
+		app_die($errfile, $errline, "Error message written to debug.log. Please try to call <a href=\"{!URL!}\">the main page</a> to continue.");
+	} elseif ($GLOBALS['error_handler']['exit_on_error'] === true) {
 		// No debug extension found, so regular output
-		debug_report_bug($msg);
+		debug_report_bug($message);
 	}
 }
 
+// Init error handler
+function initErrorHandler () {
+	enableExitOnError(false);
+}
+
+// Enable exit on error
+function enableExitOnError ($enable=true) {
+	$GLOBALS['error_handler']['exit_on_error'] = $enable;
+}
+
 // [EOF]
 ?>