X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=acd01be780c418c1a35bcf3d581f8a5c5d84a0e5;hp=507e6a10741f9750741fd2b2881b9e531437f5e1;hb=b0ed0547ba277e815ca38b3333b191149a88019c;hpb=8f37a3b2708cfc4b4ef266f4be813a84511daa8f

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 507e6a1074..acd01be780 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,17 +41,21 @@ 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) {
+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
-		debug_report_bug(__FUNCTION__, __LINE__, '() 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;
 
+	// Remember previous extension here
+	$GLOBALS['previous_extension'][$ext_name] = $previousExtension;
+
 	// Set extension mode
 	setExtensionMode($ext_mode);
 
@@ -77,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!
-			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));
+			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');
@@ -97,7 +101,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 	initExtensionSqls();
 
 	// Is the extension already loaded?
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Loading extension ' . $ext_name . ', mode=' . getExtensionMode() . ', ver=' . getCurrentExtensionVersion());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Loading extension ' . $ext_name . ', getExtensionMode()=' . getExtensionMode() . ', getCurrentExtensionVersion()=' . getCurrentExtensionVersion());
 	if ((isExtensionLoaded($ext_name)) && (getExtensionMode() == 'init')) {
 		// Debug message
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name));
@@ -109,7 +113,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 	// Is the extension file NOT there?
 	if (!isExtensionNameValid($ext_name)) {
 		// Debug message
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable.", $ext_name));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable or the PHP script is deprecated.", $ext_name));
 
 		// Abort here
 		return false;
@@ -151,19 +155,16 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 	// Extensions are not always active by default
 	setExtensionAlwaysActive('N');
 
-	// Extension update notes
-	// @TODO Do we still need this? setExtensionUpdateNotes('');
-
 	// Include the extension file
 	loadCurrentExtensionInclude();
 
 	// Is this extension deprecated?
-	if (isExtensionDeprecated()) {
+	if ((isExtensionDeprecated()) && (!in_array(getExtensionMode(), array('test', 'update', 'deactivate'))) && (isExtensionActive($ext_name))) {
 		// Deactivate the extension
 		doDeactivateExtension($ext_name);
 
 		// Abort here
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension load aborted, ext_name=' . $ext_name);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension load aborted, ext_name=' . $ext_name . ' - Extension is deprecated.');
 		return false;
 	} // END - if
 
@@ -178,28 +179,30 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
 	return true;
 }
 
-// Registeres an extension and possible update depencies
-function registerExtension ($ext_name, $taskId, $dry_run = false) {
+// Registers an extension and possible update dependencies
+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=' . $taskId . ',dry_run=' . intval($dry_run) . ' - 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();
 
 	// This shall never do a non-admin user or if the extension is active (already installed)
-	if ((!isAdmin()) || (isExtensionInstalled($ext_name))) {
+	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;
 	} // END - if
 
 	// When this extension is already in registration/update phase, all is fine
-	if ((isExtensionRegistrationRunning($ext_name)) || (isExtensionUpdateRunning($ext_name))) {
+	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.');
+		//* 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
 
@@ -213,19 +216,19 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 	} // END - if
 
 	// Is the task id zero? Then we need to auto-fix it here
-	if ($taskId == '0') {
+	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
-				debug_report_bug(__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()
 				));
@@ -239,15 +242,15 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 
 	// Init variables
 	$ret = false;
-	$test = false;
+	$processResult = false;
 	initIncludePool('extension');
 
 	// By default we have no failures
-	setExtensionReportsFailure(false);
+	enableExtensionReportingFailure();
 
 	// Does this extension exists?
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-	if (loadExtension(getCurrentExtensionName(), 'register', '0.0.0', isExtensionDryRun())) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ' - CALLING loadExtension() ...');
+	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) {
 		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) {
 
 			// 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);
 
@@ -285,19 +288,21 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 				} // END - if
 
 				// Extension version set? If empty the extension is not registered
+				//* 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...
-					$task = determineExtensionTaskId($ext_update);
+					$updateTaskId = determineExtensionTaskId($ext_update);
 
 					// Entry found?
-					if ($task > 0) {
+					//* 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=' . $task);
-						$test = registerExtension($ext_update, $task, isExtensionDryRun(), false);
+						//* 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);
-						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test));
+						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ',processResult=' . intval($processResult));
 					} // END - if
 				} elseif ($ext_ver != getCurrentExtensionVersion()) {
 					// Ok, update this extension now
@@ -312,14 +317,14 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',currVer=' . getCurrentExtensionVersion());
 
 					// All okay!
-					$test = true;
+					$processResult = true;
 				} else {
 					// Nothing to register / update before...
-					$test = true;
+					$processResult = true;
 				}
 			} else {
 				// Required file for update does not exists!
-				$test = true;
+				$processResult = true;
 				// But this is fine for the first time...
 			}
 
@@ -330,19 +335,20 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 		// Is there no update?
 		if (countExtensionUpdateDependencies(getCurrentExtensionName()) == 0) {
 			// Then test is passed!
-			$test = true;
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=true,countExtensionUpdateDependencies()=0 - Test passed!');
+			$processResult = true;
 		} // END - if
 
 		// Switch back to register mode
 		setExtensionMode('register');
 
 		// Remains true if extension registration reports no failures
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test));
-		$test = (($test === true) && (getExtensionReportsFailure() === false));
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',test=' . intval($test));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
+		$processResult = (($processResult === true) && (isExtensionReportingFailure() === false));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
 
 		// Does everthing before wents ok?
-		if ($test === true) {
+		if ($processResult === true) {
 			// "Dry-run-mode" activated?
 			if ((isExtensionDryRun() === false) && (!isExtensionOnRemovalList())) {
 				// Init SQLs and transfer ext->generic
@@ -358,7 +364,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 				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(),
@@ -368,7 +374,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 				} 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(),
@@ -409,22 +415,35 @@ function registerExtension ($ext_name, $taskId, $dry_run = false) {
 			$ret = false;
 		}
 	} elseif (($taskId > 0) && (getCurrentExtensionName() != '')) {
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 		// Remove task from system when id and extension's name is valid
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `status`='NEW' LIMIT 1",
 			array(bigintval($taskId)), __FUNCTION__, __LINE__);
 	}
 
+	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
+	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
+		 * ext-sql_patches.
+		 */
+		redirectToRequestUri();
+	} // END - if
+
 	// Return status code
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',test=' . intval($test) . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult) . ',ret=' . intval($ret) . ' - EXIT!');
 	return $ret;
 }
 
 // Run SQL queries for given extension id
 // @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 function doExtensionSqls ($ext_id, $load_mode) {
-	// This shall never do a non-admin user!
-	if (!isAdmin()) return false;
+	// 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;
+	} // END - if
 
 	// Get extension's name
 	$ext_name = getExtensionName($ext_id);
@@ -465,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
@@ -479,12 +498,13 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	} // END - if
 }
 
-// Check wether the given extension is installed
+// Check whether 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.');
+		reportBug(__FUNCTION__, __LINE__, 'ext_name is empty.');
 	} // END - if
 
 	// By default non is installed
@@ -493,25 +513,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())) {
+	} elseif (isInstallationPhase()) {
 		// Extensions are all inactive/not installed during installation
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - installation phase detected.');
 	} 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)
@@ -523,6 +546,7 @@ function isExtensionInstalled ($ext_name) {
 	}
 
 	// Return status
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',isInstalled=' . intval($isInstalled) . ' - EXIT!');
 	return $isInstalled;
 }
 
@@ -530,12 +554,14 @@ function isExtensionInstalled ($ext_name) {
 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;
 	} elseif (empty($ext_name)) {
 		// Empty extension names must befixed
-		debug_report_bug(__FUNCTION__, __LINE__, 'Empty extension name provided.');
+		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;
 	}
 
@@ -552,7 +578,7 @@ function isExtensionActive ($ext_name) {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionLoaded($ext_name)) {
 		// @TODO Extension is loaded, what next?
-		debug_report_bug(__FUNCTION__, __LINE__, 'LOADED:' . $ext_name);
+		reportBug(__FUNCTION__, __LINE__, 'LOADED:' . $ext_name);
 	} elseif (($ext_name == 'cache') || (!isExtensionInstalled('cache'))) {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DB! ext_name=' . $ext_name);
 		// Load from database
@@ -593,11 +619,12 @@ function getExtensionVersion ($ext_name, $force = false) {
 	// Empty extension name should be fixed!
 	if (empty($ext_name)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__, __LINE__, 'ext_name is empty which is not allowed here.');
+		reportBug(__FUNCTION__, __LINE__, 'ext_name is empty which is not allowed here.');
 	} // END - if
 
 	// Extensions are all inactive during installation
 	if (isInstallationPhase()) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',force=' . intval($force) . ' - Installation phase detected, returning empty version.');
 		return '';
 	} // END - if
 
@@ -605,7 +632,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 	//* 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=' . $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
@@ -620,22 +647,22 @@ function getExtensionVersion ($ext_name, $force = false) {
 		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
 	if (($data['ext_version'] == 'false') && ($force === false)) {
 		// Please report this trouble
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> has empty version!", $ext_name));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> has empty version!", $ext_name));
 	} // END - if
 
 	// Return result
@@ -644,15 +671,25 @@ 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) {
+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 . ',isDryRun=' . intval($isDryRun) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
 	if ((!isAdmin()) || (empty($ext_name))) {
-		return false;
+		// 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);
 	} // END - if
 
 	// Set current SQL name
 	setCurrentExtensionName($ext_name);
 
+	// Is this extension update already running?
+	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;
+	} // END - if
+
 	// Init arrays
 	initExtensionSqls();
 	initExtensionNotes();
@@ -668,7 +705,7 @@ 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 (-1 for making 0.0 -> 0.0.0 switch work)
 		$start = -1;
@@ -702,19 +739,19 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 						// Is the extension there?
 						if (isExtensionInstalled($ext_depend)) {
 							// Update another extension first!
-							$test = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun());
+							$processResult = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun(), true);
 						} else {
 							// Register new extension
-							$test = registerExtension($ext_depend, 0, isExtensionDryRun(), false);
+							$processResult = registerExtension($ext_depend, NULL, isExtensionDryRun());
 						}
 					} // END - if
 				} // END - foreach
 
-				// Set extension version here
-				setCurrentExtensionVersion($ext_ver);
-
 				// Set name back
 				setCurrentExtensionName($ext_name);
+
+				// Set extension version here
+				setCurrentExtensionVersion($ext_ver);
 			} // END - if
 
 			// Add notes
@@ -741,14 +778,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 . ',isDryRun=' . intval($isDryRun) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - EXIT!');
 }
 
 // Output verbose SQL table for extension
-function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false, $width = '100%') {
+function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}') {
 	// Empty title?
 	if (empty($title)) {
-		// Then fix it to default
-		$title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}';
+		// Then abort here
+		reportBug(__FUNCTION__, __LINE__, 'title is empty.');
 	} // END - if
 
 	// Init variables
@@ -772,7 +811,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 						// Prepare output for template
 						$content = array(
 							'i'   => ($idx + 1),
-							'sql' => str_replace('{', '&#123;', str_replace('}', '&#125;', encodeEntities($sql)))
+							'sql' => str_replace(array('{', '}'), array('&#123;', '&#125;'), encodeEntities($sql))
 						);
 
 						// Load row template
@@ -786,8 +825,6 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 
 			// Prepare content for template
 			$content = array(
-				'width'  => $width,
-				'dashed' => $dashed,
 				'title'  => $title,
 				'rows'   => $OUT
 			);
@@ -796,7 +833,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 			$OUT = loadTemplate('admin_extension_sql_table', true, $content);
 		} else {
 			// No addional SQL commands to run
-			$OUT = displayMessage('{--ADMIN_NO_ADDITIONAL_SQLS--}', true);
+			$OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', true);
 		}
 	} // END - if
 
@@ -834,7 +871,7 @@ function getExtensionName ($ext_id) {
 	// Did we find some extension?
 	if (empty($data['ext_name'])) {
 		// We should fix these all!
-		debug_report_bug(__FUNCTION__, __LINE__, 'ext_name is empty. ext_id=' . $ext_id);
+		reportBug(__FUNCTION__, __LINE__, 'ext_name is empty. ext_id=' . $ext_id);
 	} // END - if
 
 	// Return the extension name
@@ -855,7 +892,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?
@@ -875,7 +912,7 @@ function getExtensionId ($ext_name) {
 	return $data['ext_id'];
 }
 
-// Determines wether the given extension name is valid
+// Determines whether the given extension name is valid
 function isExtensionNameValid ($ext_name) {
 	// Do we have cache?
 	if (!isset($GLOBALS['ext_name_valid'][$ext_name])) {
@@ -890,7 +927,7 @@ function isExtensionNameValid ($ext_name) {
 	return $GLOBALS['ext_name_valid'][$ext_name];
 }
 
-// Determines wether the given extension id is valid
+// Determines whether the given extension id is valid
 function isExtensionIdValid ($ext_id) {
 	// Default is nothing valid
 	$isValid = false;
@@ -916,7 +953,7 @@ function doActivateExtension ($ext_name) {
 	// Is the extension installed?
 	if (!isExtensionInstalled($ext_name)) {
 		// Non-installed extensions cannot be activated
-		debug_report_bug(__FUNCTION__, __LINE__, 'Tried to activate non-installed extension ' . $ext_name);
+		reportBug(__FUNCTION__, __LINE__, 'Tried to activate non-installed extension ' . $ext_name);
 	} // END - if
 
 	// Activate the extension
@@ -928,11 +965,11 @@ 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
-		debug_report_bug(__FUNCTION__, __LINE__, 'Tried to deactivate non-installed extension ' . $ext_name);
+		reportBug(__FUNCTION__, __LINE__, 'Tried to deactivate non-installed extension ' . $ext_name . ',getExtensionMode()=' . getExtensionMode());
 	} // END - if
 
 	// Activate the extension
@@ -945,6 +982,12 @@ function doDeactivateExtension ($ext_name) {
 	// Create new task (we ignore the task id here)
 	createExtensionDeactivationTask($ext_name);
 
+	// Do not rebuild cache if it is already been rebuild
+	if ($inRebuild === false) {
+		// Rebuild cache
+		rebuildCache('extension', 'extension');
+	} // END - if
+
 	// Notify the admin
 	sendAdminNotification(
 		'{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}',
@@ -953,7 +996,7 @@ function doDeactivateExtension ($ext_name) {
 	);
 }
 
-// Checks wether the extension is older than given
+// Checks whether the extension is older than given
 function isExtensionOlder ($ext_name, $ext_ver) {
 	// Get current extension version
 	$currVersion = getExtensionVersion($ext_name);
@@ -983,7 +1026,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
 		} // END - if
 	} else {
 		// Extension not there! :-(
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> not found but should be updated?", $ext_name));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> not found but should be updated?", $ext_name));
 	}
 
 	// Return task id
@@ -999,9 +1042,10 @@ 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 = getMaskedMessage('ADMIN_EXTENSION_TEXT_FILE_MISSING', $ext_name);
+		$message = '{%message,ADMIN_EXTENSION_TEXT_FILE_MISSING=' . $ext_name . '%}';
 
 		// Template file
 		$FQFN = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
@@ -1036,7 +1080,8 @@ 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');
 	} // END - if
@@ -1047,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",
@@ -1098,7 +1149,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,
@@ -1126,7 +1177,7 @@ function addExtensionNotes ($ext_ver) {
 			// No update notes found
 			$content = array(
 				'ver'   => $ext_ver,
-				'notes' => '{--NO_UPDATE_NOTES--}'
+				'notes' => '{--NO_UPDATE_NOTICES--}'
 			);
 		}
 
@@ -1168,7 +1219,7 @@ function addExtensionCssFile ($file) {
 	} // END - if
 
 	// Add the entry
-	$GLOBALS['css_files'][] = $file;
+	array_push($GLOBALS['css_files'], $file);
 }
 
 // Setter for EXT_ALWAYS_ACTIVE flag
@@ -1181,7 +1232,7 @@ function getThisExtensionAlwaysActive () {
 	return $GLOBALS['ext_always_active'][getCurrentExtensionName()];
 }
 
-// Checks wether the current extension is always active
+// Checks whether the current extension is always active
 function isThisExtensionAlwaysActive () {
 	return (getThisExtensionAlwaysActive() == 'Y');
 }
@@ -1202,8 +1253,18 @@ function setExtensionDeprecated ($deprecated) {
 }
 
 // Getter for EXT_DEPRECATED flag
-function isExtensionDeprecated () {
-	return ($GLOBALS['ext_deprecated'][getCurrentExtensionName()] == 'Y');
+function isExtensionDeprecated ($ext_name = NULL) {
+	// Default is from current (NULL) extension
+	$isDeprecated = ($GLOBALS['ext_deprecated'][getCurrentExtensionName()] == 'Y');
+
+	// Is ext_name set?
+	if (!is_null($ext_name)) {
+		// Then use it instead
+		$isDeprecated = ((isset($GLOBALS['ext_deprecated'][$ext_name])) && ($GLOBALS['ext_deprecated'][$ext_name] == 'Y'));
+	} // END - if
+
+	// Return it
+	return $isDeprecated;
 }
 
 // Setter for EXT_UPDATE_DEPENDS flag
@@ -1212,24 +1273,29 @@ function addExtensionDependency ($updateDepends) {
 	//* 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());
+		reportBug(__FUNCTION__, __LINE__, 'updateDepends is empty: currentExtension=' . getCurrentExtensionName());
 	} // END - if
 
 	// Is it not yet added?
 	if ((isset($updateDepends, $GLOBALS['ext_running_updates'][getCurrentExtensionName()])) && (in_array($updateDepends, getExtensionUpdatesRunning()))) {
 		/*
-		 * Double-adding isn't fine, too. This may mean that
-		 * addExtensionDependency() was called outside the switch() command in
-		 * the extension's file which requires fixing.
+		 * Double-adding happens when the extension and an update of the same
+		 * extension requires the same other extension again.
 		 */
-		debug_report_bug(__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
 
 	// Add it to the list of extension update depencies map
-	$GLOBALS['ext_update_depends'][getCurrentExtensionName()][] = (string) $updateDepends;
+	array_push($GLOBALS['ext_update_depends'][getCurrentExtensionName()], $updateDepends);
+
+	// Init array
+	if ((!isset($GLOBALS['ext_running_updates'][getCurrentExtensionName()])) || (!is_array($GLOBALS['ext_running_updates'][getCurrentExtensionName()]))) {
+		$GLOBALS['ext_running_updates'][getCurrentExtensionName()] = array();
+	} // END - if
 
 	// Remember it in the list of running updates
-	$GLOBALS['ext_running_updates'][getCurrentExtensionName()][] = $updateDepends;
+	array_push($GLOBALS['ext_running_updates'][getCurrentExtensionName()], $updateDepends);
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ',extensionMode=' . getExtensionMode() . ' - EXIT!');
 }
 
@@ -1238,7 +1304,7 @@ function getExtensionUpdatesRunning () {
 	return $GLOBALS['ext_running_updates'][getCurrentExtensionName()];
 }
 
-// Checks wether the given extension registration is in progress
+// Checks whether the given extension registration is in progress
 function isExtensionRegistrationRunning ($ext_name) {
 	// Simply check it
 	$isRunning = ((isset($GLOBALS['ext_register_running'])) && (in_array($ext_name, $GLOBALS['ext_register_running'])));
@@ -1255,7 +1321,7 @@ function initExtensionUpdateDependencies () {
 	// Init update depency map automatically if not found
 	if (isExtensionUpdateDependenciesInitialized()) {
 		// We need these bug reports as well...
-		debug_report_bug(__FUNCTION__, __LINE__, '() is called twice: currName=' . getCurrentExtensionName());
+		reportBug(__FUNCTION__, __LINE__, '() is called twice: currName=' . getCurrentExtensionName());
 	} // END - if
 
 	$GLOBALS['ext_update_depends'][getCurrentExtensionName()] = array();
@@ -1272,40 +1338,42 @@ function addExtensionRunningRegistration ($ext_name) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Registration in progress: ext_name=' . $ext_name . ' - ENTERED!');
 	if (isExtensionRegistrationRunning($ext_name)) {
 		// This is really bad and should not be quietly ignored
-		debug_report_bug(__FUNCTION__, __LINE__, '() already called! ext_name=' . $ext_name);
+		reportBug(__FUNCTION__, __LINE__, '() already called! ext_name=' . $ext_name);
 	} // END - if
 
 	// Then add it!
-	$GLOBALS['ext_register_running'][] = $ext_name;
+	array_push($GLOBALS['ext_register_running'], $ext_name);
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Registration in progress: ext_name=' . $ext_name . ' - EXIT!');
 }
 
-// Checks wether EXT_UPDATE_DEPENDS is initialized
+// Checks whether EXT_UPDATE_DEPENDS is initialized
 function isExtensionUpdateDependenciesInitialized () {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 	return (isset($GLOBALS['ext_update_depends'][getCurrentExtensionName()]));
 }
 
-// Checks wether an update is already running for given extension
-function isExtensionUpdateRunning ($ext_name) {
+// Checks whether an update is already running for given extension
+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;
 
 		// Walk through whole array
-		foreach ($GLOBALS['ext_running_updates'] as $ext1=>$depends) {
+		foreach ($GLOBALS['ext_running_updates'] as $ext1 => $depends) {
 			// Is it found?
-			if (($ext1 == $ext_name) || ($isRunning === true)) {
+			//* 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;
-				logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning));
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=true - FOUND!');
 				break;
 			} // END - if
 		} // END - foreach
 
 		// Return result
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ', isRunning=' . intval($isRunning));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',ignoreDependencies=' . intval($ignoreDependencies) . ', isRunning=' . intval($isRunning) . ' - ALT-EXIT!');
 		return $isRunning;
 	} // END - if
 
@@ -1313,7 +1381,7 @@ function isExtensionUpdateRunning ($ext_name) {
 	$isRunning = ((isExtensionUpdateDependenciesInitialized()) && (in_array($ext_name, getExtensionRunningUpdates())));
 
 	// Return it
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ', isRunning=' . intval($isRunning));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',ignoreDependencies=' . intval($ignoreDependencies) . ', isRunning=' . intval($isRunning) . ' - EXIT!');
 	return $isRunning;
 }
 
@@ -1328,19 +1396,19 @@ function initExtensionRuningUpdates () {
 
 // Getter for EXT_UPDATE_DEPENDS flag
 function getExtensionUpdateDependencies () {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 	return $GLOBALS['ext_update_depends'][getCurrentExtensionName()];
 }
 
 // Getter for next iterator depency
 function getExtensionUpdateDependenciesIterator () {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 	return ($GLOBALS['ext_update_depends'][getCurrentExtensionName()][getExtensionUpdateIterator()]);
 }
 
 // Counter for extension update depencies
 function countExtensionUpdateDependencies () {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '=' . count($GLOBALS['ext_update_depends'][getCurrentExtensionName()]));
 	return count($GLOBALS['ext_update_depends'][getCurrentExtensionName()]);
 }
 
@@ -1349,6 +1417,9 @@ function removeExtensionDependency ($ext_name) {
 	// Look it up
 	$key = array_search($ext_name, getExtensionUpdateDependencies());
 
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',key[' . gettype($key) . ']=' . $key);
+
 	// Is it valid?
 	if ($key !== false) {
 		// Then remove it
@@ -1361,33 +1432,36 @@ function removeExtensionDependency ($ext_name) {
 
 // Init iterator for update depencies
 function initExtensionUpdateIterator () {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 	$GLOBALS['ext_depend_iterator'][getCurrentExtensionName()] = '0';
 }
 
 // Getter for depency iterator
 function getExtensionUpdateIterator () {
 	// Auto-init iterator
-	if (!isset($GLOBALS['ext_depend_iterator'][getCurrentExtensionName()])) initExtensionUpdateIterator();
+	if (!isset($GLOBALS['ext_depend_iterator'][getCurrentExtensionName()])) {
+		// Initialize update iterator
+		initExtensionUpdateIterator();
+	} // END - if
 
 	// Return it
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().'/'.$GLOBALS['ext_depend_iterator'][getCurrentExtensionName()]);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '=' . $GLOBALS['ext_depend_iterator'][getCurrentExtensionName()]);
 	return $GLOBALS['ext_depend_iterator'][getCurrentExtensionName()];
 }
 
 // Increments the update iterator
 function incrementExtensionUpdateIterator () {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
 	$GLOBALS['ext_depend_iterator'][getCurrentExtensionName()]++;
 }
 
 // Setter for EXT_REPORTS_FAILURE flag
-function setExtensionReportsFailure ($reportsFailure) {
+function enableExtensionReportingFailure ($reportsFailure = false) {
 	$GLOBALS['ext_reports_failure'] = (bool) $reportsFailure;
 }
 
 // Getter for EXT_REPORTS_FAILURE flag
-function getExtensionReportsFailure () {
+function isExtensionReportingFailure () {
 	return $GLOBALS['ext_reports_failure'];
 }
 
@@ -1398,13 +1472,20 @@ function setExtensionVersionHistory ($versionHistory) {
 
 // Getter for EXT_VER_HISTORY array
 function getExtensionVersionHistory () {
+	// Is it set?
+	if (!isset($GLOBALS['ext_ver_history'][getCurrentExtensionName()])) {
+		// Then abort here to a avoid an ugly "Undefined index" error
+		reportBug(__FUNCTION__, __LINE__, 'Extension ext-' . getCurrentExtensionName() . ' has no history set! Is this extension empty?');
+	} // END - if
+
+	// Return the history
 	return $GLOBALS['ext_ver_history'][getCurrentExtensionName()];
 }
 
-// Setter for EXT_UPDATE_NOTES
+// Setter for EXT_UPDATE_NOTICES
 function setExtensionUpdateNotes ($updateNotes, $ext_ver = '') {
-	// . '/' . getCurrentExtensionVersion()
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName() . ',getExtensionMode()=' . getExtensionMode() . ',ext_ver=' . $ext_ver . ',updateNotes()=' . strlen($updateNotes));
+	//
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName() . ',getExtensionMode()=' . getExtensionMode() . ',ext_ver=' . $ext_ver . '/' . getCurrentExtensionVersion() . ',updateNotes(length)=' . strlen($updateNotes));
 	if (empty($ext_ver)) {
 		$GLOBALS['ext_update_notes'][getCurrentExtensionName()][getCurrentExtensionVersion()] = (string) $updateNotes;
 	} else {
@@ -1412,7 +1493,7 @@ function setExtensionUpdateNotes ($updateNotes, $ext_ver = '') {
 	}
 }
 
-// Getter for EXT_UPDATE_NOTES
+// Getter for EXT_UPDATE_NOTICES
 function getExtensionUpdateNotes ($ext_ver) {
 	return $GLOBALS['ext_update_notes'][getCurrentExtensionName()][$ext_ver];
 }
@@ -1427,7 +1508,7 @@ function initExtensionNotes ($force = false) {
 	// Is it already initialized?
 	if (($force === false) && (isset($GLOBALS['ext_notes'][getCurrentExtensionName()]))) {
 		// This is mostly not wanted, so please report it
-		debug_report_bug(__FUNCTION__, __LINE__, 'ext_notes already set for extension ' . getCurrentExtensionName());
+		reportBug(__FUNCTION__, __LINE__, 'ext_notes already set for extension ' . getCurrentExtensionName());
 	} // END - if
 
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName());
@@ -1436,7 +1517,7 @@ function initExtensionNotes ($force = false) {
 
 // Append extension notice
 function appendExtensionNotes ($notes) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName() . ', notes()=' . strlen($notes));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()=' . getCurrentExtensionName() . ', notes(length)=' . strlen($notes));
 	$GLOBALS['ext_notes'][getCurrentExtensionName()] .= (string) trim($notes);
 }
 
@@ -1454,7 +1535,7 @@ function setCurrentExtensionName ($ext_name) {
 function getCurrentExtensionName () {
 	if (!isset($GLOBALS['curr_extension_name'])) {
 		// Not set!
-		debug_report_bug(__FUNCTION__, __LINE__, 'curr_extension_name not initialized. Please execute initExtensionSqls() before calling this function.');
+		reportBug(__FUNCTION__, __LINE__, 'curr_extension_name not initialized. Please execute initExtensionSqls() before calling this function.');
 	} // END - if
 
 	// Return it
@@ -1475,9 +1556,25 @@ function initExtensionSqls ($force = false) {
 
 // Adds SQLs to the SQLs array but "assigns" it with current extension name
 function addExtensionSql ($sql) {
+	// Is is the array there?
+	if ((!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()])) || (!is_array($GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()]))) {
+		// Init array
+		$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);
-	$GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()][] = $sql;
+	array_push($GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()], $sql);
 }
 
 // Getter for SQLs array for current extension
@@ -1485,7 +1582,7 @@ function getExtensionSqls () {
 	// Output debug backtrace if not found (SHOULD NOT HAPPEN!)
 	if (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()])) {
 		// Not found, should not happen
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("ext_sqls is empty, current extension: %s",
+		reportBug(__FUNCTION__, __LINE__, sprintf("ext_sqls is empty, current extension: %s",
 			getCurrentExtensionName()
 		));
 	} // END - if
@@ -1499,7 +1596,7 @@ function countExtensionSqls () {
 	// Output debug backtrace if not found (SHOULD NOT HAPPEN!)
 	if (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()])) {
 		// Not found, should not happen
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("ext_sqls is empty, current extension: %s",
+		reportBug(__FUNCTION__, __LINE__, sprintf("ext_sqls is empty, current extension: %s",
 			getCurrentExtensionName()
 		));
 	} // END - if
@@ -1522,7 +1619,7 @@ function initExtensionRemovalList () {
 	} // END - if
 }
 
-// Checks wether the current extension is on the removal list
+// Checks whether the current extension is on the removal list
 function isExtensionOnRemovalList () {
 	// Init removal list
 	initExtensionRemovalList();
@@ -1534,7 +1631,7 @@ function isExtensionOnRemovalList () {
 // Adds the current extension to the removal list
 function addCurrentExtensionToRemovalList () {
 	// Simply add it
-	$GLOBALS['ext_update_remove'][] = getCurrentExtensionName();
+	array_push($GLOBALS['ext_update_remove'], getCurrentExtensionName());
 }
 
 // Getter for removal list
@@ -1554,19 +1651,26 @@ function redirectOnUninstalledExtension ($ext_name) {
 
 // Filter for initialization of all extensions by loading them in 'init' mode
 function FILTER_INIT_EXTENSIONS () {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTERED!');
+	// Init notification pool
+	initIncludePool('notify');
+
 	// Do we have some entries?
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY!');
 	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
+
+	// Run any notifications
+	runFilterChain('load_includes', 'notify');
+
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'EXIT!');
 }
 
@@ -1581,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
@@ -1596,7 +1700,7 @@ function setCurrentExtensionVersion ($ext_ver) {
 	// ext_ver should never be empty in other modes than 'test'
 	if ((empty($ext_ver)) && (getExtensionMode() != 'test')) {
 		// Please report all these messages
-		debug_report_bug(__FUNCTION__, __LINE__, 'ext_ver is empty. Current extension name: ' . getCurrentExtensionName() . ', mode=' . getExtensionMode());
+		reportBug(__FUNCTION__, __LINE__, 'ext_ver is empty. Current extension name: ' . getCurrentExtensionName() . ', mode=' . getExtensionMode());
 	} // END - if
 
 	// Add version
@@ -1634,48 +1738,40 @@ 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
+// Checks whether the given extension has a language file
 function ifExtensionHasLanguageFile ($ext_name) {
 	// Do we have cache?
 	if (isset($GLOBALS['cache_array']['extension']['ext_lang'][$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
@@ -1687,7 +1783,7 @@ function loadCurrentExtensionInclude () {
 	// Is it readable?
 	if (!isExtensionIncludeReadable()) {
 		// Not readable
-		debug_report_bug(__FUNCTION__, __LINE__, 'Extension ' . getCurrentExtensionName() . ' should be loaded, but is not readable.');
+		reportBug(__FUNCTION__, __LINE__, 'Extension ' . getCurrentExtensionName() . ' should be loaded, but is not readable.');
 	} // END - if
 
 	// Generate INC name
@@ -1697,7 +1793,7 @@ function loadCurrentExtensionInclude () {
 	loadInclude($INC);
 }
 
-// Checks wether an extension is readable
+// Checks whether an extension is readable
 function isExtensionIncludeReadable ($ext_name = '') {
 	// If empty, use current
 	if (empty($ext_name)) {
@@ -1731,15 +1827,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
@@ -1748,27 +1839,45 @@ function isExtensionFunctionFileReadable ($ext_name) {
 }
 
 // Adds a CREATE TABLE statement if the requested table is not there
-function addCreateTableSql ($tableName, $sql) {
+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);
+		addExtensionSql('CREATE TABLE
+	`{?_MYSQL_PREFIX?}_' . $tableName . '` (' . $sql . ')
+ENGINE = {?_TABLE_TYPE?}
+CHARACTER SET utf8
+COLLATE utf8_general_ci
+COMMENT ' . chr(39) . $comment . chr(39));
 	} else {
 		// Is already there, which should not happen
-		debug_report_bug(__FUNCTION__, __LINE__, 'The table ' . $tableName . ' is already created which should not happen.');
+		reportBug(__FUNCTION__, __LINE__, 'The table ' . $tableName . ' is already created which should not happen.');
 	}
 }
 
 // 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
 }
 
@@ -1779,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,
@@ -1787,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,
@@ -1805,27 +1914,23 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
 }
 
 // Adds a guest menu to the SQL queue if the menu entry is not found
-function addGuestMenuSql ($action, $what, $title, $visible, $locked, $sort) {
+function addGuestMenuSql ($action, $what, $title, $sort) {
 	// Now check if this menu is there
 	if (!isMenuActionValid('guest', $action, $what)) {
 		// 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','%s','%s',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",
 				$action,
 				$title,
-				$visible,
-				$locked,
 				bigintval($sort)
 			);
 		} else {
 			// Add sub menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('%s','%s','%s','%s','%s',%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,
-				$visible,
-				$locked,
 				bigintval($sort)
 			);
 		}
@@ -1834,32 +1939,28 @@ function addGuestMenuSql ($action, $what, $title, $visible, $locked, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s,what=%s,title=%s,locked=%s,visible=%s detected.", $action, $what, $title, $locked, $visible));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s,what=%s,title=%s detected.", $action, $what, $title));
 	}
 }
 
 // Adds a member menu to the SQL queue if the menu entry is not found
-function addMemberMenuSql ($action, $what, $title, $visible, $locked, $sort) {
+function addMemberMenuSql ($action, $what, $title, $sort) {
 	// Now check if this menu is there
 	if (!isMenuActionValid('member', $action, $what)) {
 		// 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','%s','%s',%s)",
+			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",
 				$action,
 				$title,
-				$visible,
-				$locked,
 				bigintval($sort)
 			);
 		} else {
 			// Add sub menu
-			$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('%s','%s','%s','%s','%s',%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,
-				$visible,
-				$locked,
 				bigintval($sort)
 			);
 		}
@@ -1868,7 +1969,7 @@ function addMemberMenuSql ($action, $what, $title, $visible, $locked, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s,what=%s,title=%s,visivle=%s,locked=%s detected.", $action, $what, $title, $visible, $locked));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s,what=%s,title=%s detected.", $action, $what, $title));
 	}
 }
 
@@ -1879,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,
@@ -1887,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,
@@ -1907,7 +2008,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 // 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);
 	} elseif (isDebugModeEnabled()) {
@@ -1919,11 +2020,11 @@ 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 . '`');
 	} elseif (isDebugModeEnabled()) {
-		// Add debug line, debug_report_bug() would cause some extenion updates fail
+		// Add debug line, reportBug() would cause some extenion updates fail
 		logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $columnName . ' not found.');
 	}
 }
@@ -1934,18 +2035,74 @@ 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) {
 	// Log debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%d", getCurrentExtensionName(), intval($isProductive)));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',isProductive=', intval($isProductive));
 
 	// Set it
 	$GLOBALS['ext_productive'][getCurrentExtensionName()] = (bool) $isProductive;
 }
 
-// Checks wether the extension is in productive phase. If not set, development
+// Checks whether the extension is in productive phase. If not set, development
 // phase (=false) is assumed.
 function isExtensionProductive ($ext_name = '') {
 	// Is the extension name empty? Then use current
@@ -1953,6 +2110,7 @@ function isExtensionProductive ($ext_name = '') {
 		// Get current extension name
 		$ext_name = getCurrentExtensionName();
 	} // END - if
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ENTERED!');
 
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__][$ext_name])) {
@@ -1966,10 +2124,8 @@ function isExtensionProductive ($ext_name = '') {
 		$GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === true));
 	} // END - if
 
-	// Log debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%s", $ext_name, intval($GLOBALS[__FUNCTION__][$ext_name])));
-
 	// Return result
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',isProductive=', intval($GLOBALS[__FUNCTION__][$ext_name]) . ' - EXIT!');
 	return $GLOBALS[__FUNCTION__][$ext_name];
 }
 
@@ -1978,15 +2134,15 @@ function markExtensionAsLoaded ($ext_name) {
 	// Is it already loaded?
 	if (isExtensionLoaded($ext_name)) {
 		// Then abort here
-		debug_report_bug(__FUNCTION__, __LINE__, 'Extension ' . $ext_name . ' is already marked as loaded!');
+		reportBug(__FUNCTION__, __LINE__, 'Extension ' . $ext_name . ' is already marked as loaded!');
 	} // END - if
 
 	// Mark it
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,ext_loaded=true", $ext_name));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_loaded=true');
 	$GLOBALS['ext_loaded']['ext_name'][$ext_name] = true;
 }
 
-// Determine wether the given extension is already loaded
+// 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));
@@ -1997,14 +2153,14 @@ function markExtensionLibraryAsLoaded ($ext_name) {
 	// Is it already loaded?
 	if (isExtensionLibraryLoaded($ext_name)) {
 		// Then abort here
-		debug_report_bug(__FUNCTION__, __LINE__, 'Extension library ' . $ext_name . ' is already marked as loaded!');
+		reportBug(__FUNCTION__, __LINE__, 'Extension library ' . $ext_name . ' is already marked as loaded!');
 	} // END - if
 
 	// Mark it
 	$GLOBALS['ext_loaded']['library'][$ext_name] = true;
 }
 
-// Determine wether the given extension's library is already loaded
+// 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));