X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=debug.php;h=01198f58f5bee6ce650cb69f96cf29910474004c;hp=0d6150cadb20880a8c97ca87bfefe41dd1ea3e57;hb=ce00488222ee7d5d7559ccfdab86cb59694a681c;hpb=1e6d7b906ac9481fc5120d7a1a5e6a4d7a509296

diff --git a/debug.php b/debug.php
index 0d6150cadb..01198f58f5 100644
--- a/debug.php
+++ b/debug.php
@@ -32,44 +32,48 @@
  ************************************************************************/
 
 // 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;
 $GLOBALS['what'] = "";
 $GLOBALS['action'] = "";
-$FATAL = array();
 
 // Set module and fake "CSS mode"
-$GLOBALS['module'] = "debug"; $CSS = -1;
+$GLOBALS['module'] = "debug";
+$GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 require("inc/config.php");
 
 // Redirect only to registration page when this script is installed
-if ((isBooleanConstantAndTrue('mxchange_installed')) && (count($FATAL) == 0)) {
+if ((isInstalled()) && (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'])) {
+	if (REQUEST_ISSET_POST(('request'))) {
 		// Handle the request
-		if (DEBUG_HANDLE_REQUEST($_POST['request'])) {
+		if (DEBUG_HANDLE_REQUEST(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'])
+				SQL_ESCAPE(REQUEST_POST('request'))
 			);
 
 			// Is the module there? Else we log it!
-			if (FILE_READABLE($fqfn)) {
+			if (INCLUDE_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']);
+				DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_404", REQUEST_POST('request'));
 			}
 		} else {
 			// Unhandled request detected
-			DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_unhandled", $_POST['request']);
+			DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_unhandled", REQUEST_POST('request'));
 		}
 	} else {
 		// Empty 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... ;-)