X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fhandler.php;h=344b88a6f0e7c3aaca029d736850c441cda662aa;hb=489ff30298f6e63d6bf2f2f42e3fbfd2148f8778;hp=7dd84499a46be738879f49b8030c2d35c69927d8;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git
diff --git a/inc/handler.php b/inc/handler.php
index 7dd84499a4..344b88a6f0 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -45,25 +45,35 @@ if (!defined('__SECURITY')) {
// Error handler function
function __errorHandler ($errno, $errstr, $errfile, $errline) {
// Construct message
- $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
- $errno,
- $errstr,
- basename($errfile),
- $errline
+ $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);
+ 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 the main page to continue.");
- } else {
+ app_die($errfile, $errline, "Error message written to debug.log. Please try to call the main page 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]
?>