A lot more constants rewritten, deprecated variables with same constant name removed

[mailer.git] / debug.php

diff --git a/debug.php b/debug.php
index 0d6150cadb20880a8c97ca87bfefe41dd1ea3e57..492fe3654853b49f4263a68d133f4a1c7e6e8c4a 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -32,13 +32,12 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action, $FATAL;
+global $what, $action;
 $GLOBALS['what'] = "";
 $GLOBALS['action'] = "";
-$FATAL = array();
 
 // Set module and fake "CSS mode"
 $GLOBALS['module'] = "debug"; $CSS = -1;
@@ -47,22 +46,27 @@ $GLOBALS['module'] = "debug"; $CSS = -1;
 require("inc/config.php");
 
 // Redirect only to registration page when this script is installed
-if ((isBooleanConstantAndTrue('mxchange_installed')) && (count($FATAL) == 0)) {
+if ((isBooleanConstantAndTrue('mxchange_installed')) && (getTotalFatalErrors() == 0)) {
+       // Is the extension installed?
+       if (!EXT_IS_ACTIVE("debug")) {
+               // Then abort here
+               exit;
+       } // END - if
+
        // Is the request parameter set?
        if (isset($_POST['request'])) {
                // Handle the request
                if (DEBUG_HANDLE_REQUEST($_POST['request'])) {
                        // Construct FQFN for the module
-                       $fqfn = sprintf("%sinc/debug/%s/request_%s",
-                               PATH,
+                       $INC = sprintf("inc/debug/%s/request_%s",
                                getConfig('debug_mode'),
                                SQL_ESCAPE($_POST['request'])
                        );
 
                        // Is the module there? Else we log it!
-                       if (FILE_READABLE($fqfn)) {
+                       if (FILE_READABLE($INC)) {
                                // Load the request module
-                               require($fqfn);
+                               LOAD_INC($INC);
                        } else {
                                // Missing request file, may happen while development
                                DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_404", $_POST['request']);
@@ -77,7 +81,7 @@ if ((isBooleanConstantAndTrue('mxchange_installed')) && (count($FATAL) == 0)) {
        }
 } else {
        // Not installed or fatal errors
-       DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_fatal", count($FATAL));
+       DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_fatal", getTotalFatalErrors());
 } // END - if
 
 // Really all done here... ;-)