X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=2d399daf117a63d0dcb87dbb1f32948e9bfcfeb9;hp=90d1a92ab02034f61b85c472b1005520a8ae3667;hb=16e8327d8b9ac2f02cf49c6179e7148fc32b1066;hpb=2e8082536def80abd6b28868304c515d75e49698

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 90d1a92ab0..2d399daf11 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -41,17 +41,20 @@ 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.0', $dry_run = false) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_mode=' . $ext_mode . ',ext_ver=' . $ext_ver . ',dry_run=' . intval($dry_run) . ' - ENTERED!');
+function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = FALSE, $previousExtension = NULL) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_mode=' . $ext_mode . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ' - ENTERED!');
 	// 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')))) {
 		// If this happens twice, we need the bug report from you, except for updates/tests
-		reportBug(__FUNCTION__, __LINE__, __FUNCTION__ . '() is called twice: ext_name=' . $ext_name . ', ext_mode='. $ext_mode . ',ext_sqls=' . print_r(getExtensionSqls(), true) . ', ext_register_running=' . print_r($GLOBALS['ext_register_running'], true) . ', ext_running_updates=' . print_r($GLOBALS['ext_running_updates'], true));
+		reportBug(__FUNCTION__, __LINE__, __FUNCTION__ . '() is called twice: ext_name=' . $ext_name . ', ext_mode='. $ext_mode . ',ext_sqls=' . print_r(getExtensionSqls(), TRUE) . ', ext_register_running=' . print_r($GLOBALS['ext_register_running'], TRUE) . ', ext_running_updates=' . print_r($GLOBALS['ext_running_updates'], TRUE));
 	} // END - if
 
 	// Make sure this situation can only happen once
-	$GLOBALS['loaded_extension'][$ext_name][$ext_mode] = true;
+	$GLOBALS['loaded_extension'][$ext_name][$ext_mode] = TRUE;
+
+	// Remember previous extension here
+	$GLOBALS['previous_extension'][$ext_name] = $previousExtension;
 
 	// Set extension mode
 	setExtensionMode($ext_mode);
@@ -78,12 +81,12 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 		// In all but test-mode we need these messages to debug! Please report all (together, e.g.)
 		if (($ext_mode != 'test') && (getCurrentExtensionVersion() == '0.0.0')) {
 			// Abort here, this must now always be set!
-			reportBug(__FUNCTION__, __LINE__, 'Extension version is empty, setting to 0.0. ext_name=' . $ext_name . ', ext_mode=' . $ext_mode . ', dry_run=' . intval($dry_run));
+			reportBug(__FUNCTION__, __LINE__, 'Extension version is empty, setting to 0.0.0 ext_name=' . $ext_name . ', ext_mode=' . $ext_mode . ', isDryRun=' . intval($isDryRun));
 		} // END - if
 	}
 
 	// Set dry-run
-	enableExtensionDryRun($dry_run);
+	enableExtensionDryRun($isDryRun);
 
 	// Init array
 	initIncludePool('extension');
@@ -104,7 +107,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name));
 
 		// Abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Is the extension file NOT there?
@@ -113,7 +116,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable or the PHP script is deprecated.", $ext_name));
 
 		// Abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Load extension's own language file if not in test mode
@@ -122,7 +125,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 		loadLanguageFile($ext_name);
 	} // END - if
 
-	// Do we have cache?
+	// Is there cache?
 	if (isExtensionFunctionFileReadable($ext_name)) {
 		// Not yet loaded?
 		if ((($GLOBALS['cache_array']['extension']['ext_func'][$ext_name] == 'Y') || (!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name]))) && (!isExtensionLibraryLoaded($ext_name))) {
@@ -162,7 +165,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 
 		// Abort here
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension load aborted, ext_name=' . $ext_name . ' - Extension is deprecated.');
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Mark it as loaded in normal mode
@@ -173,17 +176,17 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 
 	// All fine!
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension successfully loaded, ext_name=' . $ext_name);
-	return true;
+	return TRUE;
 }
 
 // Registers an extension and possible update dependencies
-function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates = false) {
+function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdates = FALSE, $previousExtension = NULL) {
 	// Set current extension name
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',task_id=' . intval($taskId) . ',dry_run=' . intval($dry_run) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . intval($taskId) . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - ENTERED!');
 	setCurrentExtensionName($ext_name);
 
 	// Enable dry-run
-	enableExtensionDryRun($dry_run);
+	enableExtensionDryRun($isDryRun);
 
 	// By default all extensions are in productive phase
 	enableExtensionProductive();
@@ -192,15 +195,15 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 	if (((!isAdmin()) && (!isInstallationPhase())) || (isExtensionInstalled($ext_name))) {
 		// Abort here with 'false'
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ABORTED: isAdmin()=' . intval(isAdmin()) . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ',isExtensionInstalled()=' . intval(isExtensionInstalled($ext_name)));
-		return false;
+		return FALSE;
 	} // END - if
 
 	// When this extension is already in registration/update phase, all is fine
-	if ((isExtensionRegistrationRunning($ext_name)) || ((isExtensionUpdateRunning($ext_name)) && ($ignoreUpdates === false))) {
+	if ((isExtensionRegistrationRunning($ext_name)) || ((isExtensionUpdateRunning($ext_name)) && ($ignoreUpdates === FALSE))) {
 		// Then abort here with 'true' becaus it is fine
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine,taskId=' . $taskId . ',dry_run=' . intval($dry_run) . ',ignoreUpdates=' . intval($ignoreUpdates));
-		//* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . $taskId . ',dry_run=' . intval($dry_run) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - Please investigate!');
-		return true;
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine,taskId=' . $taskId . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates));
+		//* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . $taskId . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - Please investigate!');
+		return TRUE;
 	} // END - if
 
 	// This registration is running
@@ -213,19 +216,19 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 	} // END - if
 
 	// Is the task id zero? Then we need to auto-fix it here
-	if (($taskId == '0') && (!isInstallationPhase())) {
+	if (((is_null($taskId)) || ($taskId == '0')) && (!isInstallationPhase())) {
 		// Try to find the task
 		$taskId = determineExtensionTaskId(getCurrentExtensionName());
 
 		// Still zero and not in dry-run?
-		if (($taskId == '0') && (!isExtensionDryRun())) {
+		if (((is_null($taskId)) || ($taskId == '0')) && (!isExtensionDryRun())) {
 			// Now try to create a new task
 			$taskId = createNewExtensionTask(getCurrentExtensionName());
 
 			// Is it still zero?
-			if ($taskId == '0') {
+			if ((is_null($taskId)) || ($taskId == '0')) {
 				// Then request a bug report
-				reportBug(__FUNCTION__, __LINE__, sprintf("%s: task_id is still zero after determineExtensionTaskId(%s)",
+				reportBug(__FUNCTION__, __LINE__, sprintf("%s: task_id is still zero after determineExtensionTaskId/createNewExtensionTask(%s)",
 					__FUNCTION__,
 					getCurrentExtensionName()
 				));
@@ -238,8 +241,8 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 	initExtensionNotes();
 
 	// Init variables
-	$ret = false;
-	$processResult = false;
+	$ret = FALSE;
+	$processResult = FALSE;
 	initIncludePool('extension');
 
 	// By default we have no failures
@@ -247,7 +250,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 
 	// Does this extension exists?
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ' - CALLING loadExtension() ...');
-	if (loadExtension(getCurrentExtensionName(), 'register', '0.0.0', isExtensionDryRun())) {
+	if (loadExtension(getCurrentExtensionName(), 'register', '0.0.0', isExtensionDryRun(), $previousExtension)) {
 		// Set current extension name again
 		setCurrentExtensionName($ext_name);
 
@@ -257,7 +260,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 		foreach ($history as $ext_ver) {
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ', ext_ver=' . $ext_ver);
 			// Load extension in update mode
-			loadExtension(getCurrentExtensionName(), 'update', $ext_ver, isExtensionDryRun());
+			loadExtension(getCurrentExtensionName(), 'update', $ext_ver, isExtensionDryRun(), $previousExtension);
 
 			// Add update notes to our output
 			addExtensionNotes($ext_ver);
@@ -273,7 +276,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 
 			// Check if extension is not installed and not already in registration procedure and if loading it wents finally fine...
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',isExtensionRegistrationRunning(' . $ext_update . ')=' . intval(isExtensionRegistrationRunning($ext_update)));
-			if ((!isExtensionInstalled($ext_update)) && (!isExtensionRegistrationRunning($ext_update)) && (loadExtension($ext_update, 'test', '', isExtensionDryRun()))) {
+			if ((!isExtensionInstalled($ext_update)) && (!isExtensionRegistrationRunning($ext_update)) && (loadExtension($ext_update, 'test', '', isExtensionDryRun(), $previousExtension))) {
 				// Set current extension name again
 				setCurrentExtensionName($ext_name);
 
@@ -288,14 +291,14 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_ver[' . gettype($ext_ver) . ']=' . $ext_ver . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ',currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ' - EMPTY?');
 				if (empty($ext_ver)) {
 					// Extension not registered so far so first load task's id...
-					$taskId = determineExtensionTaskId($ext_update);
+					$updateTaskId = determineExtensionTaskId($ext_update);
 
 					// Entry found?
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'taskId=' . $taskId . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ',currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ' - CHECKING!');
-					if (($taskId > 0) || (isInstallationPhase())) {
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'updateTaskId=' . $updateTaskId . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ',currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ' - CHECKING!');
+					if (($updateTaskId > 0) || (isInstallationPhase())) {
 						// Try to register the extension
-						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ',taskId=' . $taskId . ',isExtensionDryRun()=' . isExtensionDryRun());
-						$processResult = registerExtension($ext_update, $taskId, isExtensionDryRun(), true);
+						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ',updateTaskId=' . $updateTaskId . ',isExtensionDryRun()=' . intval(isExtensionDryRun()));
+						$processResult = registerExtension($ext_update, $updateTaskId, isExtensionDryRun(), TRUE, $ext_name);
 
 						// Reset extension name
 						setCurrentExtensionName($ext_name);
@@ -314,14 +317,14 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',currVer=' . getCurrentExtensionVersion());
 
 					// All okay!
-					$processResult = true;
+					$processResult = TRUE;
 				} else {
 					// Nothing to register / update before...
-					$processResult = true;
+					$processResult = TRUE;
 				}
 			} else {
 				// Required file for update does not exists!
-				$processResult = true;
+				$processResult = TRUE;
 				// But this is fine for the first time...
 			}
 
@@ -332,7 +335,8 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 		// Is there no update?
 		if (countExtensionUpdateDependencies(getCurrentExtensionName()) == 0) {
 			// Then test is passed!
-			$processResult = true;
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=true,countExtensionUpdateDependencies()=0 - Test passed!');
+			$processResult = TRUE;
 		} // END - if
 
 		// Switch back to register mode
@@ -340,27 +344,27 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 
 		// Remains true if extension registration reports no failures
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
-		$processResult = (($processResult === true) && (isExtensionReportingFailure() === false));
+		$processResult = (($processResult === TRUE) && (isExtensionReportingFailure() === FALSE));
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
 
 		// Does everthing before wents ok?
-		if ($processResult === true) {
+		if ($processResult === TRUE) {
 			// "Dry-run-mode" activated?
-			if ((isExtensionDryRun() === false) && (!isExtensionOnRemovalList())) {
+			if ((isExtensionDryRun() === FALSE) && (!isExtensionOnRemovalList())) {
 				// Init SQLs and transfer ext->generic
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName());
 				initSqls();
 				setSqlsArray(getExtensionSqls());
 
 				// Run installation pre-installation filters
-				runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false));
+				runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'enable_codes' => FALSE));
 
 				// Register extension
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!');
 				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
 					// New way, with CSS
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion() . 'ext_css=' . getExtensionHasCss());
-					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`,`ext_active`,`ext_version`,`ext_has_css`) VALUES ('%s','%s','%s','%s')",
+					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`, `ext_has_css`) VALUES ('%s','%s','%s','%s')",
 						array(
 							getCurrentExtensionName(),
 							getThisExtensionAlwaysActive(),
@@ -370,7 +374,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 				} else {
 					// Old way, no CSS
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion());
-					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`,`ext_active`,`ext_version`) VALUES ('%s','%s','%s')",
+					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`) VALUES ('%s','%s','%s')",
 						array(
 							getCurrentExtensionName(),
 							getThisExtensionAlwaysActive(),
@@ -383,7 +387,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 				$GLOBALS['cache_array']['extension']['ext_name'][SQL_INSERTID()] = getCurrentExtensionName();
 
 				// Mark it as installed
-				$GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true;
+				$GLOBALS['ext_is_installed'][getCurrentExtensionName()] = TRUE;
 
 				// Remove cache file(s) if extension is active
 				runFilterChain('post_extension_installed', array(
@@ -393,22 +397,22 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 				));
 
 				// Re-init queries and notes
-				initExtensionSqls(true);
-				initExtensionNotes(true);
+				initExtensionSqls(TRUE);
+				initExtensionNotes(TRUE);
 
 				// In normal mode return a true on success
-				$ret = true;
-			} elseif (isExtensionDryRun() === true) {
+				$ret = TRUE;
+			} elseif (isExtensionDryRun() === TRUE) {
 				// In  "dry-run" mode do always return a true
-				$ret = true;
+				$ret = TRUE;
 			} else {
 				// Extension has been removed for updates, so all is fine!
-				$ret = true;
+				$ret = TRUE;
 			}
 		} else {
 			// No, an error occurs while registering extension :-(
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName());
-			$ret = false;
+			$ret = FALSE;
 		}
 	} elseif (($taskId > 0) && (getCurrentExtensionName() != '')) {
 		// Remove task from system when id and extension's name is valid
@@ -418,7 +422,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 	}
 
 	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
-	if (($ret === true) && ($dry_run === false) && ($ext_name == 'sql_patches') && (!isInstallationPhase())) {
+	if (($ret === TRUE) && ($isDryRun === FALSE) && ($ext_name == 'sql_patches') && (!isInstallationPhase())) {
 		/*
 		 * This is a really dirty hack to prevent an error about a missing
 		 * configuration entry which should be there after registration of
@@ -428,7 +432,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
 	} // END - if
 
 	// Return status code
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',processResult=' . intval($processResult) . ',ret=' . intval($ret) . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult) . ',ret=' . intval($ret) . ' - EXIT!');
 	return $ret;
 }
 
@@ -438,7 +442,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	// This shall never do a non-admin user but installation phase is okay
 	if ((!isAdmin()) && (!isInstallationPhase())) {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_id=' . $ext_id. ',load_mode=' . $load_mode . ',isAdmin()=' . intval(isAdmin()) . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ' - ABORT!');
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Get extension's name
@@ -454,14 +458,14 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	} // END - if
 
 	// Init array
-	initExtensionSqls(true);
+	initExtensionSqls(TRUE);
 
 	// By default no SQL has been executed
-	$sqlRan = false;
+	$sqlRan = FALSE;
 
 	// Load extension in detected mode
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode);
-	loadExtension(getCurrentExtensionName(), $load_mode, '0.0.0', false);
+	loadExtension(getCurrentExtensionName(), $load_mode, '0.0.0', FALSE);
 
 	// Init these SQLs
 	initSqls();
@@ -470,7 +474,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	// Debug message
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQLs::count=' . countSqls());
 
-	// Do we have entries?
+	// Are there entries?
 	if (isSqlsValid()) {
 		// Run SQL commands...
 		runFilterChain('run_sqls');
@@ -480,7 +484,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	runFilterChain('extension_' . $load_mode);
 
 	// Remove cache file(s) if extension is active
-	if (((isExtensionActive('cache')) && ((!SQL_HASZEROAFFECTED()) || ($sqlRan === true) || ($load_mode == 'activate') || ($load_mode == 'deactivate')))) {
+	if (((isExtensionActive('cache')) && ((!SQL_HASZEROAFFECTED()) || ($sqlRan === TRUE) || ($load_mode == 'activate') || ($load_mode == 'deactivate')))) {
 		// Run filters
 		runFilterChain('post_extension_run_sql', getCurrentExtensionName());
 	} // END - if
@@ -504,7 +508,7 @@ function isExtensionInstalled ($ext_name) {
 	} // END - if
 
 	// By default non is installed
-	$isInstalled = false;
+	$isInstalled = FALSE;
 
 	// Check if there is a cache entry
 	if (isset($GLOBALS['ext_is_installed'][$ext_name])) {
@@ -514,7 +518,7 @@ function isExtensionInstalled ($ext_name) {
 	} elseif (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
 		// Found!
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - FOUND!');
-		$isInstalled = true;
+		$isInstalled = TRUE;
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
@@ -525,16 +529,16 @@ function isExtensionInstalled ($ext_name) {
 		// Look in database
 		$ext_id = getExtensionId($ext_name);
 
-		// Do we have a record?
+		// Is there 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) {
+		if ($isInstalled === TRUE) {
 			// Dummy call (get is okay here)
-			getExtensionId($ext_name, true);
+			getExtensionId($ext_name, TRUE);
 		} // END - if
 
 		// Remember the status
@@ -551,14 +555,14 @@ function isExtensionActive ($ext_name) {
 	if (isInstallationPhase()) {
 		// Extensions are all inactive during installation
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extensions are always inactive while installation phase. ext_name=' . $ext_name);
-		return false;
+		return FALSE;
 	} elseif (empty($ext_name)) {
 		// Empty extension names must befixed
 		reportBug(__FUNCTION__, __LINE__, 'Empty extension name provided.');
 	} elseif (!isExtensionInstalled($ext_name)) {
 		// Not installed extensions are always inactive
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not installed extensions are always inactive. ext_name=' . $ext_name);
-		return false;
+		return FALSE;
 	}
 
 	// Not active is the default
@@ -607,7 +611,7 @@ function isExtensionActive ($ext_name) {
 }
 
 // Get version from extensions
-function getExtensionVersion ($ext_name, $force = false) {
+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';
@@ -656,7 +660,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 	}
 
 	// Extension version should not be invalid
-	if (($data['ext_version'] == 'false') && ($force === false)) {
+	if (($data['ext_version'] == 'false') && ($force === FALSE)) {
 		// Please report this trouble
 		reportBug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> has empty version!", $ext_name));
 	} // END - if
@@ -667,9 +671,9 @@ 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, $ignoreDependencies = false) {
+function updateExtension ($ext_name, $ext_ver, $isDryRun = FALSE, $ignoreDependencies = 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) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
 	if ((!isAdmin()) || (empty($ext_name))) {
 		// Called as non-admin or empty extension
 		reportBug(__FUNCTION__, __LINE__, 'Called as non-admin (isAdmin()=' . intval(isAdmin()) . '), or empty extension name. ext_name=' . $ext_name);
@@ -679,11 +683,11 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false, $ignoreDependen
 	setCurrentExtensionName($ext_name);
 
 	// Is this extension update already running?
-	if ((isExtensionUpdateRunning($ext_name, $ignoreDependencies)) && ($dry_run === false)) {
+	if ((isExtensionUpdateRunning($ext_name, $ignoreDependencies)) && ($isDryRun === FALSE)) {
 		// This is fine but needs logging ATM
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, all fine.');
 		//* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, please investigate!');
-		return true;
+		return TRUE;
 	} // END - if
 
 	// Init arrays
@@ -730,15 +734,15 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false, $ignoreDependen
 						setCurrentExtensionName($ext_depend);
 
 						// Mark it as already updated before we update it
-						$GLOBALS['ext_updated'][$ext_depend] = true;
+						$GLOBALS['ext_updated'][$ext_depend] = TRUE;
 
 						// Is the extension there?
 						if (isExtensionInstalled($ext_depend)) {
 							// Update another extension first!
-							$processResult = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun(), true);
+							$processResult = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun(), TRUE);
 						} else {
 							// Register new extension
-							$processResult = registerExtension($ext_depend, 0, isExtensionDryRun());
+							$processResult = registerExtension($ext_depend, NULL, isExtensionDryRun());
 						}
 					} // END - if
 				} // END - foreach
@@ -755,7 +759,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false, $ignoreDependen
 		} // END - for
 
 		// In real-mode execute any existing includes
-		if (isExtensionDryRun() === false) {
+		if (isExtensionDryRun() === FALSE) {
 			$GLOBALS['ext_inc_pool'][getCurrentExtensionName()] = getIncludePool('extension');
 			runFilterChain('load_includes', 'extension');
 			setIncludePool('extension', $GLOBALS['ext_inc_pool'][getCurrentExtensionName()]);
@@ -767,15 +771,15 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false, $ignoreDependen
 		setSqlsArray(getExtensionSqls());
 
 		// Run SQLs
-		runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false));
+		runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun(), 'enable_codes' => FALSE));
 
-		if (isExtensionDryRun() === false) {
+		if (isExtensionDryRun() === FALSE) {
 			// Run filters on success extension update
 			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) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - EXIT!');
+	//* DEBUG: */logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - EXIT!');
 }
 
 // Output verbose SQL table for extension
@@ -789,9 +793,9 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
 	// Init variables
 	$OUT = '';
 
-	// Do we have queries?
+	// Is there queries?
 	if (isVerboseSqlEnabled()) {
-		// Do we have entries?
+		// Are there entries?
 		if (countExtensionSqls() > 0) {
 			// Init counter
 			$idx = 0;
@@ -811,7 +815,7 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
 						);
 
 						// Load row template
-						$OUT .= loadTemplate('admin_extension_sql_row', true, $content);
+						$OUT .= loadTemplate('admin_extension_sql_row', TRUE, $content);
 
 						// Count up
 						$idx++;
@@ -826,10 +830,10 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
 			);
 
 			// Load main template
-			$OUT = loadTemplate('admin_extension_sql_table', true, $content);
+			$OUT = loadTemplate('admin_extension_sql_table', TRUE, $content);
 		} else {
 			// No addional SQL commands to run
-			$OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', true);
+			$OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', TRUE);
 		}
 	} // END - if
 
@@ -879,7 +883,7 @@ function getExtensionId ($ext_name) {
 	// Init id number
 	$data['ext_id'] = '0';
 
-	// Do we have cache?
+	// Is there cache?
 	if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
 		// Load from cache
 		$data['ext_id'] = $GLOBALS['cache_array']['extension']['ext_id'][$ext_name];
@@ -910,7 +914,7 @@ function getExtensionId ($ext_name) {
 
 // Determines whether the given extension name is valid
 function isExtensionNameValid ($ext_name) {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS['ext_name_valid'][$ext_name])) {
 		// Generate include file name
 		$INC = sprintf("inc/extensions/ext-%s.php", $ext_name);
@@ -926,18 +930,18 @@ function isExtensionNameValid ($ext_name) {
 // Determines whether the given extension id is valid
 function isExtensionIdValid ($ext_id) {
 	// Default is nothing valid
-	$isValid = false;
+	$isValid = FALSE;
 
 	// Check in cache then in database
 	if (isset($GLOBALS['cache_array']['extension']['ext_name'][$ext_id])) {
 		// Valid!
-		$isValid = true;
+		$isValid = TRUE;
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
 	} else {
 		// Query database
-		$isValid = (countSumTotalData($ext_id, 'extensions', 'id', 'id', true) == 1);
+		$isValid = (countSumTotalData($ext_id, 'extensions', 'id', 'id', TRUE) == 1);
 	}
 
 	// Return result
@@ -961,7 +965,7 @@ function doActivateExtension ($ext_name) {
 }
 
 // Deactivate given extension
-function doDeactivateExtension ($ext_name) {
+function doDeactivateExtension ($ext_name, $inRebuild = FALSE) {
 	// Is the extension installed?
 	if (!isExtensionInstalled($ext_name)) {
 		// Non-installed extensions cannot be activated
@@ -978,8 +982,11 @@ function doDeactivateExtension ($ext_name) {
 	// Create new task (we ignore the task id here)
 	createExtensionDeactivationTask($ext_name);
 
-	// Rebuild cache
-	rebuildCache('extension', 'extension');
+	// Do not rebuild cache if it is already been rebuild
+	if ($inRebuild === FALSE) {
+		// Rebuild cache
+		rebuildCache('extension', 'extension');
+	} // END - if
 
 	// Notify the admin
 	sendAdminNotification(
@@ -1035,7 +1042,8 @@ function createNewExtensionTask ($ext_name) {
 	$taskId = determineTaskIdBySubject($subject);
 
 	// Not installed and do we have created a task for the admin?
-	if (($taskId == '0') && (!isExtensionInstalled($ext_name))) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId[' . gettype($taskId) . ']=' . $taskId);
+	if (((is_null($taskId)) || ($taskId == '0')) && (!isExtensionInstalled($ext_name))) {
 		// Set default message if ext-foo is missing
 		$message = '{%message,ADMIN_EXTENSION_TEXT_FILE_MISSING=' . $ext_name . '%}';
 
@@ -1049,14 +1057,14 @@ function createNewExtensionTask ($ext_name) {
 		// Load text for task if found
 		if (isFileReadable($FQFN)) {
 			// Load extension's description template (but do not compile the code)
-			$message = loadTemplate('ext_' . $ext_name, true, array(), false);
+			$message = loadTemplate('ext_' . $ext_name, TRUE, array(), FALSE);
 		} else {
 			// Write this in debug.log as well
 			logDebugMessage(__FUNCTION__, __LINE__, $message);
 		}
 
 		// Task not created so it's a brand-new extension which we need to register and create a task for!
-		$taskId = createNewTask($subject, $message, 'EXTENSION', 0, getCurrentAdminId(), false);
+		$taskId = createNewTask($subject, $message, 'EXTENSION', 0, getCurrentAdminId(), FALSE);
 	} // END - if
 
 	// Return task id
@@ -1072,9 +1080,10 @@ function createExtensionDeactivationTask ($ext_name) {
 	$taskId = determineTaskIdBySubject($subject);
 
 	// Not installed and do we have created a task for the admin?
-	if (($taskId == '0') && (isExtensionInstalled($ext_name))) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId[' . gettype($taskId) . ']=' . $taskId);
+	if (((is_null($taskId)) || ($taskId == '0')) && (isExtensionInstalled($ext_name))) {
 		// Task not created so add it
-		$taskId = createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', true, $ext_name)), 'EXTENSION_DEACTIVATION');
+		$taskId = createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', TRUE, $ext_name)), 'EXTENSION_DEACTIVATION');
 	} // END - if
 
 	// Return task id
@@ -1083,8 +1092,14 @@ function createExtensionDeactivationTask ($ext_name) {
 
 // Determines the task id for given extension
 function determineExtensionTaskId ($ext_name) {
+	// Is it installation phase and table task_system is not found?
+	if ((isInstallationPhase()) && (!ifSqlTableExists('task_system'))) {
+		// Then return NULL (not found)
+		return NULL;
+	} // END - if
+
 	// Default is not found
-	$data['task_id'] = '0';
+	$data['task_id'] = NULL;
 
 	// Search for extension task's id
 	$result = SQL_QUERY_ESC("SELECT `id` AS task_id FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1",
@@ -1149,25 +1164,25 @@ function addExtensionNotes ($ext_ver) {
 				// Initial release
 				$content = array(
 					'ver'   => $ext_ver,
-					'notes' => '{--INITIAL_RELEASE--}'
+					'notes' => '{--ADMIN_EXTENSION_INITIAL_RELEASE--}'
 				);
 			} else {
 				// Not productive
 				$content = array(
 					'ver'   => $ext_ver,
-					'notes' => '{--DEVELOPER_RELEASE--}'
+					'notes' => '{--ADMIN_EXTENSION_DEVELOPER_RELEASE--}'
 				);
 			}
 		} else {
 			// No update notes found
 			$content = array(
 				'ver'   => $ext_ver,
-				'notes' => '{--NO_UPDATE_NOTICES--}'
+				'notes' => '{--ADMIN_EXTENSION_UPDATE_NOTICES_404--}'
 			);
 		}
 
 		// Load template
-		$out = loadTemplate('admin_extension_notes', true, $content);
+		$out = loadTemplate('admin_extension_notes', TRUE, $content);
 	} // END - if
 
 	// Add the notes
@@ -1267,7 +1282,7 @@ function addExtensionDependency ($updateDepends) {
 		 * 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.');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'updateDepends=' . $updateDepends . ',extensionMode=' . getExtensionMode() . ',currentExtension=' . getCurrentExtensionName() . ' - called twice.');
 		return;
 	} // END - if
 
@@ -1338,20 +1353,20 @@ function isExtensionUpdateDependenciesInitialized () {
 }
 
 // Checks whether an update is already running for given extension
-function isExtensionUpdateRunning ($ext_name, $ignoreDependencies = false) {
+function isExtensionUpdateRunning ($ext_name, $ignoreDependencies = FALSE) {
 	// Current and given extensions means whole array
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
 	if ($ext_name == getCurrentExtensionName()) {
 		// Default is not found
-		$isRunning = false;
+		$isRunning = FALSE;
 
 		// Walk through whole array
 		foreach ($GLOBALS['ext_running_updates'] as $ext1 => $depends) {
 			// Is it found?
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',depends=' . print_r($depends, true));
-			if (($ext1 == $ext_name) || ((in_array($ext_name, $depends)) && ($ignoreDependencies === false))) {
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',depends=' . print_r($depends, TRUE));
+			if (($ext1 == $ext_name) || ((in_array($ext_name, $depends)) && ($ignoreDependencies === FALSE))) {
 				// Found
-				$isRunning = true;
+				$isRunning = TRUE;
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=true - FOUND!');
 				break;
 			} // END - if
@@ -1406,7 +1421,7 @@ function removeExtensionDependency ($ext_name) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',key[' . gettype($key) . ']=' . $key);
 
 	// Is it valid?
-	if ($key !== false) {
+	if ($key !== FALSE) {
 		// Then remove it
 		unset($GLOBALS['ext_update_depends'][getCurrentExtensionName()][$key]);
 
@@ -1441,7 +1456,7 @@ function incrementExtensionUpdateIterator () {
 }
 
 // Setter for EXT_REPORTS_FAILURE flag
-function enableExtensionReportingFailure ($reportsFailure = false) {
+function enableExtensionReportingFailure ($reportsFailure = FALSE) {
 	$GLOBALS['ext_reports_failure'] = (bool) $reportsFailure;
 }
 
@@ -1489,9 +1504,9 @@ function isExtensionUpdateNoteSet ($ext_ver) {
 }
 
 // Init extension notice
-function initExtensionNotes ($force = false) {
+function initExtensionNotes ($force = FALSE) {
 	// Is it already initialized?
-	if (($force === false) && (isset($GLOBALS['ext_notes'][getCurrentExtensionName()]))) {
+	if (($force === FALSE) && (isset($GLOBALS['ext_notes'][getCurrentExtensionName()]))) {
 		// This is mostly not wanted, so please report it
 		reportBug(__FUNCTION__, __LINE__, 'ext_notes already set for extension ' . getCurrentExtensionName());
 	} // END - if
@@ -1528,9 +1543,9 @@ function getCurrentExtensionName () {
 }
 
 // Init SQLs array for current extension
-function initExtensionSqls ($force = false) {
+function initExtensionSqls ($force = FALSE) {
 	// Auto-init the array or if forced
-	if (($force === true) || (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()]))) {
+	if (($force === TRUE) || (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()]))) {
 		// Set the array
 		$GLOBALS['ext_sqls'][getCurrentExtensionName()] = array();
 
@@ -1547,6 +1562,16 @@ function addExtensionSql ($sql) {
 		$GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()] = array();
 	} // END - if
 
+	// Is the SQL statement empty?
+	if (empty($sql)) {
+		/*
+		 * Abort here as this may happen if getExtensionMode() is 'activate' or
+		 * 'deactivate'. This means that for 'mode' are no SQL statements
+		 * specified.
+		 */
+		return;
+	} // END - if
+
 	// Add it
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
 	array_push($GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()], $sql);
@@ -1630,15 +1655,15 @@ function FILTER_INIT_EXTENSIONS () {
 	// Init notification pool
 	initIncludePool('notify');
 
-	// Do we have some entries?
+	// Are there some entries?
 	if (isset($GLOBALS['cache_array']['extension']['ext_name'])) {
 		// Load all found extensions if found
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - START!');
 		foreach ($GLOBALS['cache_array']['extension']['ext_name'] as $key => $ext_name) {
 			// Load it
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - START');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - START');
 			loadExtension($ext_name, 'init', getExtensionVersion($ext_name));
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - END');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - END');
 		} // END - foreach
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - END!');
 	} // END - if
@@ -1660,14 +1685,14 @@ function getExtensionMode () {
 }
 
 // Setter for dry-run
-function enableExtensionDryRun ($dry_run = true) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',dry_run='.intval($dry_run));
-	$GLOBALS['ext_dry_run'] = (bool) $dry_run;
+function enableExtensionDryRun ($isDryRun = TRUE) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',isDryRun='.intval($isDryRun));
+	$GLOBALS['ext_isDryRun'] = (bool) $isDryRun;
 }
 
 // Getter for dry-run
 function isExtensionDryRun () {
-	return $GLOBALS['ext_dry_run'];
+	return $GLOBALS['ext_isDryRun'];
 }
 
 // Setter for current extension version
@@ -1706,7 +1731,7 @@ function removeExtensionFromArray () {
 			$key = array_search($ext_name, $cacheArray);
 
 			// Is it there?
-			if ($key !== false) {
+			if ($key !== FALSE) {
 				// Found, so remove it
 				unset($cacheArray[$key]);
 				$GLOBALS['cache_array']['extension'][$cacheName] = $cacheArray;
@@ -1721,7 +1746,7 @@ function removeExtensionFromArray () {
 
 // "Getter" for 'extension has a CSS file' (with same name, of course)
 function getExtensionHasCss () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][getCurrentExtensionName()][getCurrentTheme()])) {
 		// Construct FQFN for check
 		$FQFN = sprintf("%stheme/%s/css/%s.css",
@@ -1740,7 +1765,7 @@ function getExtensionHasCss () {
 
 // Checks whether the given extension has a language file
 function ifExtensionHasLanguageFile ($ext_name) {
-	// Do we have cache?
+	// Is there cache?
 	if (isset($GLOBALS['cache_array']['extension']['ext_lang'][$ext_name])) {
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
@@ -1816,7 +1841,7 @@ function isExtensionFunctionFileReadable ($ext_name) {
 // Adds a CREATE TABLE statement if the requested table is not there
 function addCreateTableSql ($tableName, $sql, $comment) {
 	// Is the table not there?
-	if (!isSqlTableCreated($tableName)) {
+	if (!ifSqlTableExists($tableName)) {
 		// Is not found, so add it
 		addExtensionSql('CREATE TABLE
 	`{?_MYSQL_PREFIX?}_' . $tableName . '` (' . $sql . ')
@@ -1833,13 +1858,26 @@ COMMENT ' . chr(39) . $comment . chr(39));
 // Adds a DROP TABLE statement if the requested tabled is there
 function addDropTableSql ($tableName) {
 	// Is the table there?
-	if (isSqlTableCreated($tableName)) {
+	if (ifSqlTableExists($tableName)) {
 		// Then add it, non-existing tables can be ignored because it will
 		// happen with every newly installed extension.
 		addExtensionSql('DROP TABLE `{?_MYSQL_PREFIX?}_' . $tableName . '`');
 
 		// Mark it as gone
-		$GLOBALS['isSqlTableCreated'][$tableName] = false;
+		$GLOBALS['ifSqlTableExists'][$tableName] = FALSE;
+	} // END - if
+}
+
+// Adds a RENAME TABLE stament if 'from' table exist and 'to' table not
+function addRenameTableSql ($fromTable, $toTable) {
+	// Is renaming required?
+	if ((ifSqlTableExists($fromTable)) && (!ifSqlTableExists($toTable))) {
+		// Add it
+		addExtensionSql('RENAME TABLE `{?_MYSQL_PREFIX?}_' . $fromTable . '` TO `{?_MYSQL_PREFIX?}_' . $toTable . '`');
+
+		// Mark both tables
+		$GLOBALS['ifSqlTableExists'][$fromTable] = FALSE;
+		$GLOBALS['ifSqlTableExists'][$toTable]   = TRUE;
 	} // END - if
 }
 
@@ -1850,7 +1888,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
 		// Is what null?
 		if (is_null($what)) {
 			// Add main menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s',NULL,'%s','%s',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('%s',NULL,'%s','%s',%s)",
 				$action,
 				$title,
 				$descr,
@@ -1858,7 +1896,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
 			);
 		} else {
 			// Add sub menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('%s','%s','%s','%s',%s)",
 				$action,
 				$what,
 				$title,
@@ -1882,14 +1920,14 @@ function addGuestMenuSql ($action, $what, $title, $sort) {
 		// Is what null?
 		if (is_null($what)) {
 			// Add main menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",
 				$action,
 				$title,
 				bigintval($sort)
 			);
 		} else {
 			// Add sub menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','N','Y',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s','%s','%s','N','Y',%s)",
 				$action,
 				$what,
 				$title,
@@ -1912,14 +1950,14 @@ function addMemberMenuSql ($action, $what, $title, $sort) {
 		// Is what null?
 		if (is_null($what)) {
 			// Add main menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",
 				$action,
 				$title,
 				bigintval($sort)
 			);
 		} else {
 			// Add sub menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','N','Y',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s','%s','%s','N','Y',%s)",
 				$action,
 				$what,
 				$title,
@@ -1942,7 +1980,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 		// Is what null?
 		if (is_null($what)) {
 			// Add main menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`,`what`,`title`,`active`,`sort`) VALUES ('%s',NULL,'%s','%s',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('%s',NULL,'%s','%s',%s)",
 				$action,
 				$title,
 				$active,
@@ -1950,7 +1988,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 			);
 		} else {
 			// Add sub menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`,`what`,`title`,`active`,`sort`) VALUES ('%s','%s','%s','%s',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('%s','%s','%s','%s',%s)",
 				$action,
 				$what,
 				$title,
@@ -1967,12 +2005,48 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 	}
 }
 
+// Add ALTER TABLE `foo` ADD sql if not found
+function addExtensionAddTableColumnSql ($tableName, $columnName, $columnSql) {
+	// Is the column there?
+	if (!ifSqlColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $columnName)) {
+		// Then add it
+		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_' . $tableName . '` ADD `' . $columnName . '` ' . $columnSql);
+	} elseif (isDebugModeEnabled()) {
+		// Add debug line
+		logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',columnSql=' . $columnSql . ': does already exist.');
+	}
+}
+
+// Add ALTER TABLE `foo` CHANGE sql if not found
+function addExtensionChangeTableColumnSql ($tableName, $fromColumnName, $toColumnName, $columnSql) {
+	// Is the column there?
+	if ((ifSqlColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $fromColumnName)) && (($fromColumnName == $toColumnName) || (!ifSqlColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $toColumnName)))) {
+		// Then add it
+		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_' . $tableName . '` CHANGE `' . $fromColumnName . '` `' . $toColumnName . '` ' . $columnSql);
+	} elseif (isDebugModeEnabled()) {
+		// Add debug line
+		logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',fromColumnName=' . $fromColumnName . ',toColumnName=' . $toColumnName . ',columnSql=' . $columnSql . ': Cannot be changed.');
+	}
+}
+
+// Add ALTER TABLE `foo` DROP sql if not found
+function addExtensionDropTableColumnSql ($tableName, $columnName) {
+	// Is the column there?
+	if (ifSqlColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $columnName)) {
+		// Then add it
+		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_' . $tableName . '` DROP `' . $columnName . '`');
+	} elseif (isDebugModeEnabled()) {
+		// Add debug line
+		logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ': does not exist.');
+	}
+}
+
 // Add configuration entry if not found for actual extension
 function addConfigAddSql ($columnName, $columnSql) {
 	// Is the column there?
-	if (!isSqlTableColumnFound('{?_MYSQL_PREFIX?}_config', $columnName)) {
+	if (!ifSqlColumnExists('{?_MYSQL_PREFIX?}_config', $columnName)) {
 		// Not found, so add it
-		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `' . $columnName . '` ' . $columnSql);
+		addExtensionAddTableColumnSql('config', $columnName, $columnSql);
 	} elseif (isDebugModeEnabled()) {
 		// Add debug line
 		logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $columnName . ' already created. columnSql=' . $columnSql);
@@ -1982,9 +2056,9 @@ function addConfigAddSql ($columnName, $columnSql) {
 // Drop configuration entry if found for actual extension
 function addConfigDropSql ($columnName) {
 	// Is the column there?
-	if (isSqlTableColumnFound('{?_MYSQL_PREFIX?}_config', $columnName)) {
+	if (ifSqlColumnExists('{?_MYSQL_PREFIX?}_config', $columnName)) {
 		// Found, so add it
-		addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` DROP `' . $columnName . '`');
+		addExtensionDropTableColumnSql('config', $columnName);
 	} elseif (isDebugModeEnabled()) {
 		// Add debug line, reportBug() would cause some extenion updates fail
 		logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $columnName . ' not found.');
@@ -1997,10 +2071,66 @@ function addConfigChangeSql ($oldColumnName, $newColumnName, $columnSql) {
 	addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `' . $oldColumnName . '` `' . $newColumnName . '` ' . $columnSql);
 }
 
+/**
+ * Checks if given subject is found and if not, adds an SQL query to the
+ * extension registration queue.
+ */
+function registerExtensionPointsData ($subject, $columnName, $lockedMode, $paymentMethod) {
+	// Default is old extension version
+	$add = '';
+
+	// Is the extension equal or newer 0.8.9?
+	if (((isInstallationPhase()) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (isExtensionInstalledAndNewer('sql_patches', '0.8.9'))) {
+		// Then add provider
+		$add = " AND `account_provider`='EXTENSION'";
+	} // END - if
+
+	// Is the 'subject' there?
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ifSqlTableExists(points_data)=' . ifSqlTableExists('points_data') . ',getExtensionMode()=' . getExtensionMode() . ',add=' . $add);
+	if (((!ifSqlTableExists('points_data')) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (countSumTotalData($subject, 'points_data', 'id', 'subject', TRUE, $add) == 0)) {
+		// Not found so:
+		if ((isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) && (!ifSqlTableExists('points_data'))) {
+			$dummy = $GLOBALS['previous_extension'][getCurrentExtensionName()];
+			reportBug(__FUNCTION__, __LINE__, 'previous_extension[' . gettype($dummy) . ']=' . $dummy . ',getCurrentExtensionName()=' . getCurrentExtensionName() . ' - Under development, please report this!');
+		} // END - if
+
+		// ... add an SQL query
+		addExtensionSql(sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('%s','%s','%s','%s')",
+			$subject,
+			$columnName,
+			$lockedMode,
+			$paymentMethod
+		));
+	} // END - if
+}
+
+/**
+ * Checks if given subject is found and if so, adds an SQL query to the
+ * extension unregistration queue.
+ */
+function unregisterExtensionPointsData ($subject) {
+	// Default is old extension version
+	$add = '';
+
+	// Is the extension equal or newer 0.8.9?
+	if (isExtensionInstalledAndNewer('sql_patches', '0.8.9')) {
+		// Then add provider
+		$add = " AND `account_provider`='EXTENSION'";
+	} // END - if
+
+	// Is the 'subject' there?
+	if (countSumTotalData($subject, 'points_data', 'id', 'subject', TRUE, $add) == 1) {
+		// Found one or more, so add an SQL query
+		addExtensionSql(sprintf("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s'" . $add . " LIMIT 1",
+			$subject
+		));
+	} // END - if
+}
+
 // Enables/disables productive mode for current extension (used only while
 // registration).
 // @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
-function enableExtensionProductive ($isProductive = true) {
+function enableExtensionProductive ($isProductive = TRUE) {
 	// Log debug message
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',isProductive=', intval($isProductive));
 
@@ -2018,7 +2148,7 @@ function isExtensionProductive ($ext_name = '') {
 	} // END - if
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ENTERED!');
 
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$ext_name])) {
 		// Load extension only if not yet loaded
 		if (!isset($GLOBALS['ext_productive'][$ext_name])) {
@@ -2027,7 +2157,7 @@ function isExtensionProductive ($ext_name = '') {
 		} // END - if
 
 		// Determine it
-		$GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === true));
+		$GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === TRUE));
 	} // END - if
 
 	// Return result
@@ -2045,13 +2175,13 @@ function markExtensionAsLoaded ($ext_name) {
 
 	// Mark it
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_loaded=true');
-	$GLOBALS['ext_loaded']['ext_name'][$ext_name] = true;
+	$GLOBALS['ext_loaded']['ext_name'][$ext_name] = TRUE;
 }
 
 // Determine whether the given extension is already loaded
 function isExtensionLoaded ($ext_name) {
 	// Is it there?
-	return ((isset($GLOBALS['ext_loaded']['ext_name'][$ext_name])) && ($GLOBALS['ext_loaded']['ext_name'][$ext_name] === true));
+	return ((isset($GLOBALS['ext_loaded']['ext_name'][$ext_name])) && ($GLOBALS['ext_loaded']['ext_name'][$ext_name] === TRUE));
 }
 
 // Mark extension's library file as loaded
@@ -2063,13 +2193,13 @@ function markExtensionLibraryAsLoaded ($ext_name) {
 	} // END - if
 
 	// Mark it
-	$GLOBALS['ext_loaded']['library'][$ext_name] = true;
+	$GLOBALS['ext_loaded']['library'][$ext_name] = TRUE;
 }
 
 // Determine whether the given extension's library is already loaded
 function isExtensionLibraryLoaded ($ext_name) {
 	// Is it there?
-	return ((isset($GLOBALS['ext_loaded']['library'][$ext_name])) && ($GLOBALS['ext_loaded']['library'][$ext_name] === true));
+	return ((isset($GLOBALS['ext_loaded']['library'][$ext_name])) && ($GLOBALS['ext_loaded']['library'][$ext_name] === TRUE));
 }
 
 // [EOF]