X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=62ab4f43018852eede4458dad60983498b366e17;hb=27cffdf12876899294d61de9cdc0f4f3d20d1eb4;hp=5f93aecc45eff0ccb99eb72e33083c05237673c0;hpb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 5f93aecc45..62ab4f4301 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -88,7 +88,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
 		$GLOBALS['ext_loaded']['lang'][$ext_name] = true;
 		loadIncludeOnce($langInclude);
-	} elseif ($ext_name != 'sql_patches') {
+	} elseif (($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
 		// No language file is not so good...
 		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("WARNING: Extension %s has no language file or we cannot read from it. lang=%s",
 			$ext_name, getLanguage()
@@ -104,7 +104,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded.");
 		$GLOBALS['ext_loaded']['funcs'][$ext_name] = true;
 		loadIncludeOnce($funcsInclude);
-	} elseif ($ext_name != 'sql_patches') {
+	} elseif (($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
 		// No functions file is not so good...
 		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("WARNING: Extension %s has no own functions file or we cannot read from it.",
 			$ext_name
@@ -392,7 +392,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 		if ($load_mode == 'remove') {
 			// Delete this extension (remember to remove it from your server *before* you click on welcome!
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-			array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
+				array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
 		} // END - if
 	} // END - if
 
@@ -434,7 +434,7 @@ function EXT_IS_ACTIVE ($ext_name) {
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-		array($ext_name), __FUNCTION__, __LINE__);
+			array($ext_name), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -486,14 +486,17 @@ function GET_EXT_VERSION ($ext_name) {
 	} elseif (!isCacheInstanceValid()) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-		array($ext_name), __FUNCTION__, __LINE__);
+			array($ext_name), __FUNCTION__, __LINE__);
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");
 
 		// Is the extension there?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load entry
 			list($ext_ver) = SQL_FETCHROW($result);
-		} // END - if
+		} elseif (isDebugModeEnabled()) {
+			// Not found!
+			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name));
+		}
 
 		// Free result
 		SQL_FREERESULT($result);
@@ -1250,11 +1253,23 @@ function EXT_GET_REMOVAL_LIST () {
 // Redirects if the provided extension is not installed
 function redirectOnUninstalledExtension ($ext_name) {
 	// So is the extension there?
-	if (!EXT_IS_ACTIVE($ext_name)) {
+	if ((!isExtensionInstalled($ext_name)) || (!EXT_IS_ACTIVE($ext_name))) {
 		// Redirect to index
 		redirectToUrl('modules.php?module=index&msg=' . getCode('EXTENSION_PROBLEM') . '&ext=' . $ext_name);
 	} // END - if
 }
 
+// Determines wether the given extension is installed
+function isExtensionInstalled ($ext_name) {
+	// Default is not installed
+	$isInstalled = false;
+
+	// Check cache ext_version
+	$isInstalled = isset($GLOBALS['cache_array']['extensions']['ext_version'][$ext_name]);
+
+	// Return status
+	return $isInstalled;
+}
+
 //
 ?>