Login form for guests in surfbar added, some trigger_error() added, misc rewrites

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index 09fc98937897af00392d8b0f9285ea81073e5d48..1c28ca893f87bd82be84240467f1bb38142d69ab 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -45,24 +45,25 @@ if (!defined('__SECURITY')) {
 // 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]