X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=62ab4f43018852eede4458dad60983498b366e17;hb=75062a410999a290b18fe181370139b37a160eb5;hp=09fbc8c9c091cc5d4661607aa7c51c33e05dda97;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 09fbc8c9c0..62ab4f4301 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -61,6 +61,8 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
 	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));
+
+		// Abort here
 		return false;
 	} // END - if
 
@@ -71,7 +73,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
 	// Is the extension file NOT there?
 	if (!isIncludeReadable($INC)) {
 		// Debug message
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name));
+		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable.", $ext_name));
 
 		// Abort here
 		return false;
@@ -86,7 +88,12 @@ 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);
-	} // END - if
+	} 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()
+		));
+	}
 
 	// Construct FQFN for functions file
 	$funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
@@ -97,6 +104,11 @@ 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') && (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
+		));
 	} // END - if
 
 	// Extensions are not deprecated by default
@@ -328,7 +340,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
 			redirectToUrl('modules.php?module=admin&logout=1&' . $EXT_LOAD_MODE . '=sql_patches');
 		} else {
 			// Add temporary filter
-			REGISTER_FILTER('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true);
+			registerFilter('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true);
 			$GLOBALS['ext_load_mode'] = $EXT_LOAD_MODE;
 		}
 	} // END - if
@@ -380,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
 
@@ -422,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) {
@@ -474,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);
@@ -579,7 +594,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
 }
 
 // Output verbose SQL table for extension
-function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = '', $dashed = '', $switch = false, $width = "100%") {
+function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = '', $dashed = '', $switch = false, $width = '100%') {
 	// Empty title?
 	if (empty($title)) {
 		// Then fix it to default
@@ -901,7 +916,6 @@ function ADD_EXTENSION_NOTES ($ver) {
 
 	// Is do we have verbose output enabled?
 	if ((getConfig('verbose_sql') == 'Y') || (!EXT_IS_ACTIVE('sql_patches'))) {
-
 		// Update notes found?
 		if (EXT_GET_UPDATE_NOTES() != '') {
 			// Update notes found
@@ -1239,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;
+}
+
 //
 ?>