X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=ba65fb3649aec021a10536b64bc80071e3eab821;hb=9b87babf90b27658be4a1cef2c0465e2ce9ed681;hp=0fbfc12dbf32e5be8e0d9a2623d5ec1bfe4bc54f;hpb=4c83f0cc7459cad9ec9c1c68963f5365155ee935;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 0fbfc12dbf..ba65fb3649 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
 
 // Load the extension and maybe found language and function files.
 function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run = false, &$SQLs = array()) {
-	global $EXT_LOADED, $_CONFIG, $EXT_VER_HISTORY;
+	global $_CONFIG, $EXT_VER_HISTORY;
 	global $INC_POOL, $EXT_UPDATE_DEPENDS, $EXT_DEPRECATED, $UPDATE_NOTES;
 	global $EXT_VERSION, $EXT_ALWAYS_ACTIVE;
 
@@ -48,7 +48,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 
 	// Is the extension already loaded?
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Loading extension {$ext_name}, mode={$EXT_LOAD_MODE}, ver={$EXT_VER}.");
-	if ((isset($EXT_LOADED['ext'][$ext_name])) && (empty($EXT_LOAD_MODE))) {
+	if ((isset($GLOBALS['ext_loaded']['ext'][$ext_name])) && (empty($EXT_LOAD_MODE))) {
 		// Debug message
 		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name));
 		return false;
@@ -73,10 +73,10 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 	$langInclude = sprintf("inc/language/%s_%s.php", $ext_name, GET_LANGUAGE());
 
 	// Is this include there?
-	if ((FILE_READABLE($langInclude)) && (!isset($EXT_LOADED['lang'][$ext_name]))) {
+	if ((FILE_READABLE($langInclude)) && (!isset($GLOBALS['ext_loaded']['lang'][$ext_name]))) {
 		// Then load it
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
-		$EXT_LOADED['lang'][$ext_name] = true;
+		$GLOBALS['ext_loaded']['lang'][$ext_name] = true;
 		LOAD_INC_ONCE($langInclude);
 	} // END - if
 
@@ -84,10 +84,10 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 	$funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
 
 	// Is this include there?
-	if ((FILE_READABLE($funcsInclude)) && (!isset($EXT_LOADED['funcs'][$ext_name]))) {
+	if ((FILE_READABLE($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) {
 		// Then load it
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded.");
-		$EXT_LOADED['funcs'][$ext_name] = true;
+		$GLOBALS['ext_loaded']['funcs'][$ext_name] = true;
 		LOAD_INC_ONCE($funcsInclude);
 	} // END - if
 
@@ -119,7 +119,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 	// Mark it as loaded in normal mode
 	if (empty($EXT_LOAD_MODE)) {
 		// Mark it now...
-		$EXT_LOADED['ext'][$ext_name] = true;
+		$GLOBALS['ext_loaded']['ext'][$ext_name] = true;
 	} // END - if
 
 	// All fine!
@@ -320,7 +320,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 // Check if given extension is active
 function EXT_IS_ACTIVE ($ext_name) {
 	// Extensions are all inactive during installation
-	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling()) || (empty($ext_name))) return false;
+	if ((!isInstalled()) || (isInstalling()) || (empty($ext_name))) return false;
 
 	// Not active is the default
 	$active = "N";
@@ -333,6 +333,9 @@ function EXT_IS_ACTIVE ($ext_name) {
 
 		// Count cache hits
 		incrementConfigEntry('cache_hits');
+	} elseif (isset($GLOBALS['ext_loaded'][$ext_name])) {
+		// Extension is loaded!
+		die("LOADED:$ext_name");
 	} elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
 		// Load from database
@@ -369,7 +372,7 @@ function GET_EXT_VERSION ($ext_name) {
 	$ext_ver = false;
 
 	// Extensions are all inactive during installation
-	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling())) return "";
+	if ((!isInstalled()) || (isInstalling())) return "";
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ext_name={$ext_name}");
 
 	// Is the cache written?
@@ -756,8 +759,8 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
 		// Free memory
 		SQL_FREERESULT($result);
 	} elseif (GET_EXT_VERSION("sql_patches") == "") {
-		// No sql_patches installed, so maybe in admin area?
-		$ret = ((IS_ADMIN()) && ($mod == "admin")); // Then there is a menu!
+		// No sql_patches installed, so maybe in admin area or no admin registered?
+		$ret = (((IS_ADMIN()) || (!isAdminRegistered())) && ($mod == "admin")); // Then there is a menu!
 	}
 
 	// Return status