X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhandler.php;h=344b88a6f0e7c3aaca029d736850c441cda662aa;hb=eebb737fcb823c159d66732d37c336bc932c3246;hp=b9ab89405562ee58f9962f5921c31ec1e9586aaa;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/inc/handler.php b/inc/handler.php
index b9ab894055..344b88a6f0 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -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')) {
 		// 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 {
+		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]
 ?>