X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhandler.php;h=1c28ca893f87bd82be84240467f1bb38142d69ab;hb=fbee2462e65a3ccdfea9ddb5e019dc3d3ea016e3;hp=7bba6be8918fbeb5d3870c4038a72e9563735c62;hpb=1c4f807554d765e3d6767634f997c960477f3c1d;p=mailer.git

diff --git a/inc/handler.php b/inc/handler.php
index 7bba6be891..1c28ca893f 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -38,31 +38,32 @@
 
 // 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),
 		$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
-		app_die(__FUNCTION__, __LINE__, "Error message written to debug.log. Please try to call <a href=\"{!URL!}\">the main page</a> to continue.");
-	} else {
-		// 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]