X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=53619443ea04258c5da03a41596399a1f92d5847;hb=14caafbca5a4e94c7a22cec65c3a825243114d70;hp=9228cf4f42c2b7fd99bd6040ac28d6f4a09e4cb2;hpb=c6e62b16b4474ead6b180a5b9648906459d846da;p=mailer.git

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 9228cf4f42..53619443ea 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load the extension and maybe found language and function files.
-function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false) {
+function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = false) {
 	// Loading an extension in same mode, but not test/update, twice is not
 	// good, so is the extension $ext_name already loaded in mode $ext_mode?
 	if ((isset($GLOBALS['loaded_extension'][$ext_name][$ext_mode])) && (!in_array($ext_mode, array('update', 'test')))) {
@@ -66,7 +66,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false
 		setCurrentExtensionVersion($ext_ver);
 	} else {
 		// Set it to 0.0 by default
-		setCurrentExtensionVersion('0.0');
+		setCurrentExtensionVersion('0.0.0');
 
 		// Is the extension installed?
 		if ((isExtensionInstalled($ext_name)) && ($ext_mode != 'register')) {
@@ -75,7 +75,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false
 		} // END - if
 
 		// In all but test-mode we need these messages to debug! Please report all (together, e.g.)
-		if (($ext_mode != 'test') && (getCurrentExtensionVersion() == '0.0')) {
+		if (($ext_mode != 'test') && (getCurrentExtensionVersion() == '0.0.0')) {
 			// Abort here, this must now always be set!
 			debug_report_bug(__FUNCTION__, __LINE__, 'Extension version is empty, setting to 0.0. ext_name=' . $ext_name . ', ext_mode=' . $ext_mode . ', dry_run=' . intval($dry_run));
 		} // END - if
@@ -155,8 +155,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false
 	// @TODO Do we still need this? setExtensionUpdateNotes('');
 
 	// Include the extension file
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension loaded.');
-	loadExtensionInclude();
+	loadCurrentExtensionInclude();
 
 	// Is this extension deprecated?
 	if (isExtensionDeprecated()) {
@@ -164,6 +163,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false
 		doDeactivateExtension($ext_name);
 
 		// Abort here
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension load aborted, ext_name=' . $ext_name);
 		return false;
 	} // END - if
 
@@ -174,13 +174,14 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false
 	} // END - if
 
 	// All fine!
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension successfully loaded, ext_name=' . $ext_name);
 	return true;
 }
 
-// Registeres an extension and possible update depencies
-function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true) {
+// Registers an extension and possible update dependencies
+function registerExtension ($ext_name, $taskId, $dry_run = false) {
 	// Set current extension name
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',task_id=' . $taskId . ',dry_run=' . intval($dry_run) . ',logout=' . intval($logout) . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',task_id=' . $taskId . ',dry_run=' . intval($dry_run) . ' - ENTERED!');
 	setCurrentExtensionName($ext_name);
 
 	// Enable dry-run
@@ -198,7 +199,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 	// When this extension is already in registration/update phase, all is fine
 	if ((isExtensionRegistrationRunning($ext_name)) || (isExtensionUpdateRunning($ext_name))) {
 		// Then abort here with 'true' becaus it is fine
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ' - ALREADY!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine.');
 		return true;
 	} // END - if
 
@@ -246,7 +247,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 
 	// Does this extension exists?
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-	if (loadExtension(getCurrentExtensionName(), 'register', '0.0', isExtensionDryRun())) {
+	if (loadExtension(getCurrentExtensionName(), 'register', '0.0.0', isExtensionDryRun())) {
 		// Set current extension name again
 		setCurrentExtensionName($ext_name);
 
@@ -414,20 +415,6 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 			array(bigintval($taskId)), __FUNCTION__, __LINE__);
 	}
 
-	// Is this the sql_patches?
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . '/' . getExtensionMode());
-	if ((getCurrentExtensionName() == 'sql_patches') && ((getExtensionMode() == 'register') || (getExtensionMode() == 'remove')) && (!isExtensionDryRun()) && ($test)) {
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ': LOAD!');
-		if ($logout === true) {
-			// Then redirect to logout
-			redirectToUrl('modules.php?module=admin&logout=1&' . getExtensionMode() . '=sql_patches');
-		} else {
-			// Add temporary filter
-			registerFilter('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true);
-			$GLOBALS['ext_load_mode'] = getExtensionMode();
-		}
-	} // END - if
-
 	// Return status code
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',test=' . intval($test) . ' - EXIT!');
 	return $ret;
@@ -459,7 +446,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 
 	// Load extension in detected mode
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode);
-	loadExtension(getCurrentExtensionName(), $load_mode, '0.0', false);
+	loadExtension(getCurrentExtensionName(), $load_mode, '0.0.0', false);
 
 	// Init these SQLs
 	initSqls();
@@ -495,6 +482,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 // Check wether the given extension is installed
 function isExtensionInstalled ($ext_name) {
 	// We don't like empty extension names here
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ENTERED!');
 	if (empty($ext_name)) {
 		// Please fix them all
 		debug_report_bug(__FUNCTION__, __LINE__, 'ext_name is empty.');
@@ -506,25 +494,28 @@ function isExtensionInstalled ($ext_name) {
 	// Check if there is a cache entry
 	if (isset($GLOBALS['ext_is_installed'][$ext_name])) {
 		// Use cache built from below queries
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - CACHE!');
 		$isInstalled = $GLOBALS['ext_is_installed'][$ext_name];
 	} elseif (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
 		// Found!
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - FOUND!');
 		$isInstalled = true;
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
 	} elseif ((isInstallationPhase())) {
 		// Extensions are all inactive/not installed during installation
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - installion phase');
 	} else {
 		// Look in database
 		$ext_id = getExtensionId($ext_name);
 
-		// Log debug message
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension ' . $ext_name . ' has ext_id=' . $ext_id);
-
 		// Do we have a record?
 		$isInstalled = ($ext_id > 0);
 
+		// Log debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_id=' . $ext_id . ',isInstalled=' . intval($isInstalled));
+
 		// Is it installed, then cache the entry
 		if ($isInstalled === true) {
 			// Dummy call (get is okay here)
@@ -536,6 +527,7 @@ function isExtensionInstalled ($ext_name) {
 	}
 
 	// Return status
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',isInstalled=' . intval($isInstalled) . ' - EXIT!');
 	return $isInstalled;
 }
 
@@ -600,6 +592,7 @@ function isExtensionActive ($ext_name) {
 // Get version from extensions
 function getExtensionVersion ($ext_name, $force = false) {
 	// By default no extension is found
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ENTERED!');
 	$data['ext_version'] = 'false';
 
 	// Empty extension name should be fixed!
@@ -609,13 +602,15 @@ function getExtensionVersion ($ext_name, $force = false) {
 	} // END - if
 
 	// Extensions are all inactive during installation
-	if (isInstallationPhase()) return '';
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name);
+	if (isInstallationPhase()) {
+		return '';
+	} // END - if
 
 	// Is the cache written?
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - Checking cache ...');
 	if (isset($GLOBALS['cache_array']['extension']['ext_version'][$ext_name])) {
 		// Load data from cache
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $ext_name . ': CACHE!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ': CACHE!');
 		$data['ext_version'] = $GLOBALS['cache_array']['extension']['ext_version'][$ext_name];
 
 		// Count cache hits
@@ -624,22 +619,22 @@ function getExtensionVersion ($ext_name, $force = false) {
 		// 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__);
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $ext_name . ': DB - '.SQL_NUMROWS($result).'');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ': DB - '.SQL_NUMROWS($result).'');
 
 		// Is the extension there?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load entry
 			$data = SQL_FETCHARRAY($result);
+
+			// Set cache
+			$GLOBALS['cache_array']['extension']['ext_version'][$ext_name] = $data['ext_version'];
 		} elseif (isDebugModeEnabled()) {
-			// Not found, please report all
-			debug_report_bug(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name));
+			// Not found, may happen while an extension is uninstalled
+			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot find extension %s in database!", $ext_name));
 		}
 
 		// Free result
 		SQL_FREERESULT($result);
-
-		// Set cache
-		$GLOBALS['cache_array']['extension']['ext_version'][$ext_name] = $data['ext_version'];
 	}
 
 	// Extension version should not be invalid
@@ -656,13 +651,22 @@ function getExtensionVersion ($ext_name, $force = false) {
 // Updates a given extension with current extension version to latest version
 function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 	// Only admins are allowed to update extensions
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_ver=' . $ext_ver . ',dry_run=' . intval($dry_run) . ' - ENTERED!');
 	if ((!isAdmin()) || (empty($ext_name))) {
-		return false;
+		// Called as non-admin or empty extension
+		debug_report_bug(__FUNCTION__, __LINE__, 'Called as non-admin (isAdmin()=' . intval(isAdmin()) . '), or empty extension name. ext_name=' . $ext_name);
 	} // END - if
 
 	// Set current SQL name
 	setCurrentExtensionName($ext_name);
 
+	// Is this extension update already running?
+	if (isExtensionUpdateRunning($ext_name)) {
+		// This is fine but needs logging ATM
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, all fine.');
+		return true;
+	} // END - if
+
 	// Init arrays
 	initExtensionSqls();
 	initExtensionNotes();
@@ -678,10 +682,13 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 	initExtensionSqls();
 
 	// Check if version is updated
-	//* DEBUG: */ debugOutput(getCurrentExtensionName() . '/' . $ext_name . ':' . getThisExtensionVersion() . '/' . $ext_ver . '/' . intval(is_array($history)));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, getCurrentExtensionName() . '/' . $ext_name . ':' . getThisExtensionVersion() . '/' . $ext_ver . '/' . intval(is_array($history)));
 	if (((getThisExtensionVersion() != $ext_ver) || (isExtensionDryRun())) && (is_array($history))) {
-		// Search for starting point
-		$start = array_search($ext_ver, $history);
+		// Search for starting point (-1 for making 0.0 -> 0.0.0 switch work)
+		$start = -1;
+		if ($ext_ver != '0.0') {
+			$start = array_search($ext_ver, $history);
+		} // END - if
 
 		// And load SQL queries in order of version history
 		for ($idx = ($start + 1); $idx < count($history); $idx++) {
@@ -748,14 +755,16 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 			runFilterChain('extension_update', getCurrentExtensionName());
 		} // END - if
 	} // END - if
+
+	//* DEBUG: */logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_ver=' . $ext_ver . ',dry_run=' . intval($dry_run) . ' - EXIT!');
 }
 
 // Output verbose SQL table for extension
-function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false, $width = '100%') {
+function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}', $dashed = '', $switch = false, $width = '100%') {
 	// Empty title?
 	if (empty($title)) {
-		// Then fix it to default
-		$title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}';
+		// Then abort here
+		debug_report_bug(__FUNCTION__, __LINE__, 'title is empty.');
 	} // END - if
 
 	// Init variables
@@ -862,7 +871,7 @@ function getExtensionId ($ext_name) {
 		incrementStatsEntry('cache_hits');
 	} else {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `id` AS ext_id FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `id` AS `ext_id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
 			array($ext_name), __FUNCTION__, __LINE__);
 
 		// Is the entry there?
@@ -1105,7 +1114,7 @@ function addExtensionNotes ($ext_ver) {
 	// Is do we have verbose output enabled?
 	if ((!isExtensionActive('sql_patches')) || (isVerboseSqlEnabled())) {
 		// Update notes found?
-		if (isExtensionUpdateNoteSet($ext_ver)) {
+		if ((isExtensionUpdateNoteSet($ext_ver)) && ($ext_ver != '0.0.0')) {
 			// Update notes found
 			$content = array(
 				'ver'   => $ext_ver,
@@ -1114,12 +1123,21 @@ function addExtensionNotes ($ext_ver) {
 
 			// Reset them
 			setExtensionUpdateNotes('', $ext_ver);
-		} elseif (in_array($ext_ver, array('0.0', '0.0.0'))) {
-			// Initial release
-			$content = array(
-				'ver'   => $ext_ver,
-				'notes' => '{--INITIAL_RELEASE--}'
-			);
+		} elseif ($ext_ver == '0.0.0') {
+			// Is the extension productive?
+			if (isExtensionProductive(getCurrentExtensionName())) {
+				// Initial release
+				$content = array(
+					'ver'   => $ext_ver,
+					'notes' => '{--INITIAL_RELEASE--}'
+				);
+			} else {
+				// Not productive
+				$content = array(
+					'ver'   => $ext_ver,
+					'notes' => '{--DEVELOPER_RELEASE--}'
+				);
+			}
 		} else {
 			// No update notes found
 			$content = array(
@@ -1206,27 +1224,29 @@ function isExtensionDeprecated () {
 
 // Setter for EXT_UPDATE_DEPENDS flag
 function addExtensionDependency ($updateDepends) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - ENTERED!');
 	// Is the update depency empty? (NEED TO BE FIXED!)
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ',extensionMode=' . getExtensionMode() . ' - ENTERED!');
 	if (empty($updateDepends)) {
 		// Please report this bug!
 		debug_report_bug(__FUNCTION__, __LINE__, 'updateDepends is empty: currentExtension=' . getCurrentExtensionName());
 	} // END - if
 
 	// Is it not yet added?
-	/* Only for debugging!
 	if ((isset($updateDepends, $GLOBALS['ext_running_updates'][getCurrentExtensionName()])) && (in_array($updateDepends, getExtensionUpdatesRunning()))) {
-		// Double-adding isn't fine, too
-		debug_report_bug(__FUNCTION__, __LINE__, '() called twice: updateDepends=' . $updateDepends . ',currentExtension=' . getCurrentExtensionName());
+		/*
+		 * Double-adding happens when the extension and an update of the same
+		 * extension requires the same other extension again.
+		 */
+		logDebugMessage(__FUNCTION__, __LINE__, 'updateDepends=' . $updateDepends . ',extensionMode=' . getExtensionMode() . ',currentExtension=' . getCurrentExtensionName() . ' - called twice.');
+		return;
 	} // END - if
-	*/
 
 	// Add it to the list of extension update depencies map
 	$GLOBALS['ext_update_depends'][getCurrentExtensionName()][] = (string) $updateDepends;
 
 	// Remember it in the list of running updates
 	$GLOBALS['ext_running_updates'][getCurrentExtensionName()][] = $updateDepends;
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ',extensionMode=' . getExtensionMode() . ' - EXIT!');
 }
 
 // Getter for running updates
@@ -1292,10 +1312,11 @@ function isExtensionUpdateRunning ($ext_name) {
 		// Walk through whole array
 		foreach ($GLOBALS['ext_running_updates'] as $ext1=>$depends) {
 			// Is it found?
-			if (($ext1 == $ext_name) || ($isRunning === true)) {
-				// found
-				logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning));
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',depends=' . print_r($depends, true));
+			if (($ext1 == $ext_name) || (in_array($ext_name, $depends))) {
+				// Found
 				$isRunning = true;
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning));
 				break;
 			} // END - if
 		} // END - foreach
@@ -1578,7 +1599,7 @@ function getExtensionMode () {
 
 // Setter for dry-run
 function enableExtensionDryRun ($dry_run = true) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',dry='.intval($dry_run));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',dry_run='.intval($dry_run));
 	$GLOBALS['ext_dry_run'] = (bool) $dry_run;
 }
 
@@ -1630,28 +1651,29 @@ function removeExtensionFromArray () {
 			} // END - if
 		}
 	} // END - foreach
+
+	// Remove from other caches as well
+	unset($GLOBALS['ext_is_installed'][$ext_name]);
+	unset($GLOBALS['loaded_extension'][$ext_name]);
 }
 
 // "Getter" for 'extension has a CSS file' (with same name, of course)
 function getExtensionHasCss () {
-	// Default is no CSS
-	$hasCss = 'N';
-
-	// Construct FQFN for check
-	$FQFN = sprintf("%stheme/%s/css/%s.css",
-		getPath(),
-		getCurrentTheme(),
-		getCurrentExtensionName()
-	);
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][getCurrentExtensionName()][getCurrentTheme()])) {
+		// Construct FQFN for check
+		$FQFN = sprintf("%stheme/%s/css/%s.css",
+			getPath(),
+			getCurrentTheme(),
+			getCurrentExtensionName()
+		);
 
-	// Is it there?
-	if (isFileReadable($FQFN)) {
-		// Readable, so it is there...
-		$hasCss = 'Y';
+		// Is it there?
+		$GLOBALS[__FUNCTION__][getCurrentExtensionName()][getCurrentTheme()] = convertBooleanToYesNo(isFileReadable($FQFN));
 	} // END - if
 
 	// Return it
-	return $hasCss;
+	return $GLOBALS[__FUNCTION__][getCurrentExtensionName()][getCurrentTheme()];
 }
 
 // Checks wether the given extension has a language file
@@ -1661,25 +1683,16 @@ function ifExtensionHasLanguageFile ($ext_name) {
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
 	} else {
-		// Not readable is default
-		$readable = 'N';
-
-		// Is the language file readable for this extension?
-		if (isLanguageIncludeReadable($ext_name)) {
-			// Readable
-			$readable = 'Y';
-		} // END - if
-
-		// Put it in cache
-		$GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] = $readable;
+		// Determine it and put it in cache
+		$GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] = convertBooleanToYesNo(isLanguageIncludeReadable($ext_name));
 	}
 
 	// Return result
 	return ($GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] == 'Y');
 }
 
-// Load an extension's include file
-function loadExtensionInclude () {
+// Load current extension's include file
+function loadCurrentExtensionInclude () {
 	// Is it readable?
 	if (!isExtensionIncludeReadable()) {
 		// Not readable
@@ -1696,7 +1709,9 @@ function loadExtensionInclude () {
 // Checks wether an extension is readable
 function isExtensionIncludeReadable ($ext_name = '') {
 	// If empty, use current
-	if (empty($ext_name)) $ext_name = getCurrentExtensionName();
+	if (empty($ext_name)) {
+		$ext_name = getCurrentExtensionName();
+	} // END - if
 
 	// Array found?
 	if (!isset($GLOBALS['ext_inc_readable'][$ext_name])) {
@@ -1725,15 +1740,10 @@ function isExtensionFunctionFileReadable ($ext_name) {
 		$funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
 
 		// Is this include there?
-		if ((isFileReadable($funcsInclude)) && (!isExtensionLibraryLoaded($ext_name)) && (getExtensionMode() == 'test')) {
-			// Cache it!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_func=Y - FOUND!');
-			$GLOBALS['cache_array']['extension']['ext_func'][$ext_name] = 'Y';
-		} else {
-			// Cache it!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_func=N - NOT FOUND!');
-			$GLOBALS['cache_array']['extension']['ext_func'][$ext_name] = 'N';
-		}
+		$isIncludeFound = ((isFileReadable($funcsInclude)) && (!isExtensionLibraryLoaded($ext_name)) && (getExtensionMode() == 'test'));
+
+		// And put in cache, converted
+		$GLOBALS['cache_array']['extension']['ext_func'][$ext_name] = convertBooleanToYesNo($isIncludeFound);
 	}
 
 	// Return result
@@ -1904,7 +1914,7 @@ function addConfigAddSql ($columnName, $columnSql) {
 	if (!isSqlTableColumnFound('{?_MYSQL_PREFIX?}_config', $columnName)) {
 		// Not found, so add it
 		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `' . $columnName . '` ' . $columnSql);
-	} else {
+	} elseif (isDebugModeEnabled()) {
 		// Add debug line
 		logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $columnName . ' already created. columnSql=' . $columnSql);
 	}
@@ -1916,7 +1926,7 @@ function addConfigDropSql ($columnName) {
 	if (isSqlTableColumnFound('{?_MYSQL_PREFIX?}_config', $columnName)) {
 		// Found, so add it
 		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` DROP `' . $columnName . '`');
-	} else {
+	} elseif (isDebugModeEnabled()) {
 		// Add debug line, debug_report_bug() would cause some extenion updates fail
 		logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $columnName . ' not found.');
 	}
@@ -1924,14 +1934,8 @@ function addConfigDropSql ($columnName) {
 
 // Change configuration entry for actual extension
 function addConfigChangeSql ($oldColumnName, $newColumnName, $columnSql) {
-	// Is the old column there?
-	if (isSqlTableColumnFound('{?_MYSQL_PREFIX?}_config', $oldColumnName)) {
-		// Found so add it
-		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `' . $oldColumnName . '` `' . $newColumnName . '` ' . $columnSql);
-	} else {
-		// Add debug line, debug_report_bug() would cause some extenion updates fail
-		logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $oldColumnName . ' not found.');
-	}
+	// Add the SQL statement
+	addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `' . $oldColumnName . '` `' . $newColumnName . '` ' . $columnSql);
 }
 
 // Enables/disables productive mode for current extension (used only while
@@ -1982,6 +1986,7 @@ function markExtensionAsLoaded ($ext_name) {
 	} // END - if
 
 	// Mark it
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,ext_loaded=true", $ext_name));
 	$GLOBALS['ext_loaded']['ext_name'][$ext_name] = true;
 }