X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=1851e5d4a851379affe3c2b345b75e45dc8f53c6;hp=7f43bbac09bc8c96c556acbe5aa17a40cdd3728e;hb=f7f6e55ee0d90558ad773ce6168767c0af816696;hpb=8a9324b2d931f54f54f4319fd7234910af77012c

diff --git a/inc/extensions.php b/inc/extensions.php
index 7f43bbac09..1851e5d4a8 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -32,15 +32,15 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 //
-function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
+function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 {
-	global $NOTES, $CONFIG, $INC_POOL;
+	global $NOTES, $_CONFIG, $INC_POOL, $cacheInstance;
 	// We want to register an extension and registration status is by default "failed" (= false)
 	$EXT_LOAD_MODE = "register"; $ret = false; $SQLs = array();
 	$INC_POOL = array();
@@ -52,54 +52,51 @@ function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
 	if (EXT_IS_ACTIVE($ext_name)) return false;
 
 	// Generate file name
-	$file = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name);
+	$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
 
 	// Does this extension exists?
-	if (file_exists($file) && is_readable($file))
-	{
+	if (FILE_READABLE($file)) {
 		// Extension was found so we can load it in registration mode
 		require($file);
 
 		// And run possible updates
 		$EXT_LOAD_MODE = "update"; $EXT_UPDATE_DEPENDS = "";
-		foreach ($EXT_VER_HISTORY as $EXT_VER)
-		{
+		foreach ($EXT_VER_HISTORY as $EXT_VER) {
+			// Load extension in update mode
 			require($file);
-			if (((GET_EXT_VERSION("sql_patches") != "") && ($CONFIG['verbose_sql'] == 'Y')) || (!EXT_IS_ACTIVE("sql_patches")))
-			{
-				if (!empty($UPDATE_NOTES))
-				{
+
+			// Do we have an update?
+			if (((GET_EXT_VERSION("sql_patches") != "") && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
+				if (!empty($UPDATE_NOTES)) {
 					// Update notes found
 					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".$UPDATE_NOTES."<br /><br />\n";
 					$UPDATE_NOTES = "";
-				}
-				 elseif (($EXT_VER == "0.0") || ($EXT_VER == "0.0.0"))
-				{
+				} elseif (($EXT_VER == "0.0") || ($EXT_VER == "0.0.0")) {
 					// Initial release
 					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".INITIAL_RELEASE."<br /><br />\n";
-				}
-				 else
-				{
+				} else {
+					// No update notes found!
 					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br /><I>".NO_UPDATE_NOTES."</I><br /><br />\n";
 				}
-			}
-		}
+			} // END - if
+		} // END - foreach
 
 		// Does this extension depends on an outstanding update of another update?
-		if (!empty($EXT_UPDATE_DEPENDS))
-		{
+		if (!empty($EXT_UPDATE_DEPENDS)) {
 			// Backup SQL commands and clear current
-			$SQLs2 = $SQLs;  $SQLs = array(); $test = false;
+			$SQLs2 = $SQLs;
+			$SQLs  = array();
+			$test  = false;
 
 			// Backup language as well
 			$LANG_BCK = $EXT_LANG_PREFIX;
+			$EXT_ALWAYS_ACTIVE = "N";
 
 			// Load required extension also in update mode
-			$file = sprintf(PATH."inc/extensions/ext-%s.php", $EXT_UPDATE_DEPENDS);
+			$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $EXT_UPDATE_DEPENDS);
 
 			// Check for required file
-			if (file_exists($file) && is_readable($file))
-			{
+			if (FILE_READABLE($file)) {
 				// File exists so let's load it
 				$VER_BACKUP = $EXT_VERSION;
 				require($file);
@@ -107,33 +104,35 @@ function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
 
 				// If versions mismatch update extension first
 				$ext_ver = GET_EXT_VERSION($EXT_UPDATE_DEPENDS);
-				if (empty($ext_ver))
-				{
+
+				// Extension version set?
+				if (empty($ext_ver)) {
 					// Extension not registered so far so first load task's ID...
 					$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE task_type='EXTENSION' AND subject LIKE '[%s:]%%' LIMIT 1",
 					 array($EXT_UPDATE_DEPENDS), __FILE__, __LINE__);
-					if (SQL_NUMROWS($result) == 1)
-					{
+
+					// Entry found?
+					if (SQL_NUMROWS($result) == 1) {
 						// Task found so load task's ID and register extension...
 						list($task) = SQL_FETCHROW($result);
-						SQL_FREERESULT($result);
+
+						// Try to register the extension
 						$test = EXTENSION_REGISTER($EXT_UPDATE_DEPENDS, $task, $dry_run);
-					}
-				}
-				 elseif ($ext_ver != $EXT_VERSION)
-				{
+					} // END - if
+
+					// Free result
+					SQL_FREERESULT($result);
+				} elseif ($ext_ver != $EXT_VERSION) {
 					// Ok, update this extension now
 					EXTENSION_UPDATE(basename($file), $EXT_UPDATE_DEPENDS, $ext_ver, $dry_run);
+
+					// All okay!
 					$test = true;
-				}
-				 else
-				{
+				} else {
 					// Nothing to register / update before...
 					$test = true;
 				}
-			}
-			 else
-			{
+			} else {
 				// Required file for update does not exists!
 				$test = true;
 				// But this is fine for the first time...
@@ -142,63 +141,77 @@ function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
 			// Finally restore previous SQLs
 			$SQLs = $SQLs2; unset($SQLs2);
 			$EXT_LANG_PREFIX = $LANG_BCK;
-		}
-		 else
-		{
+		} else {
 			// Does not depend on an other extension
 			$test = true;
 		}
 
+		// Switch back to register mode
+		$EXT_LOAD_MODE = "register";
+
 		// Does everthing before wents ok?
-		if ($test)
-		{
+		if ($test) {
 			// "Dry-run-mode" activated?
-			if (!$dry_run)
-			{
-				// Are there any SQL commands to run?
-				if (count($SQLs) > 0)
-				{
-					foreach ($SQLs as $sql)
-					{
-						$sql = trim($sql);
-						// Run SQL command
-						if (!empty($sql))
-						{
-							// Run SQLs without compiling them...
+			if (!$dry_run) {
+				// Run all SQLs
+				foreach ($SQLs as $sql) {
+					// Trim spaces away which we don't need
+					$sql = trim($sql);
+
+					// Is there still an SQL query?
+					if (!empty($sql)) {
+						// Do we have an "ALTER TABLE" command?
+						if (substr(strtolower($sql), 0, 11) == "alter table") {
+							// Analyse the alteration command
+							SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
+						} else {
+							// Run regular SQL command
 							$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
 						}
-					}
-				}
+					} // END - if
+				} // END - foreach
+
+				// Remove cache file(s) if extension is active
+				if ((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) {
+					//* DEBUG: */ echo __LINE__.": DESTROY!<br />\n";
+					// Remove cache files
+					if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
+					if ($cacheInstance->cache_file("mod_reg", true))    $cacheInstance->cache_destroy();
+					if ($cacheInstance->cache_file("config", true))     $cacheInstance->cache_destroy();
+				} // END - if
 
 				// Check for added include files
-				if (count($INC_POOL > 0))
-				{
+				if (count($INC_POOL > 0)) {
 					// Loads every include file
-					foreach ($INC_POOL as $inc)
-					{
+					foreach ($INC_POOL as $inc) {
 						require_once($inc);
-					}
-				}
+					} // END - foreach
+
+					// Remove array
+					unset($INC_POOL);
+				} // END - if
 
 				// Register extension
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s', '%s', 'N', '%s')",
-				 array($ext_name, $EXT_LANG_PREFIX, $EXT_VERSION), __FILE__, __LINE__);
+				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s','%s','%s','%s')",
+				 array($ext_name, $EXT_LANG_PREFIX, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
 				// Update task management
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE id=%d LIMIT 1",
-				 array(bigintval($id)), __FILE__, __LINE__);
+				ADMIN_SOLVE_TASK($id);
+
+				// @TODO This causes the whole (!) menu cache being purged
+				CACHE_PURGE_ADMIN_MENU();
 
 				// In normal mode return a true on success
-				$ret = true; unset($SQLs);
-			}
-			 else
-			{
+				$ret = true;
+
+				// Remove SQLs
+				unset($SQLs);
+			} else {
 				// Rewrite SQL command to keep { and } inside
-				foreach ($SQLs as $key=>$sql)
-				{
+				foreach ($SQLs as $key => $sql) {
 					$sql = str_replace('{', "&#123;", str_replace('}', "&#125;", $sql));
 					$SQLs[$key] = $sql;
-				}
+				} // END - foreach
 
 				// In  "dry-run" mode return array with all SQL commands
 				$ret = $SQLs;
@@ -206,41 +219,52 @@ function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
 				// Remove all SQL commands
 				unset($SQLs);
 			}
-		}
-		 else
-		{
+		} else {
 			// No, an error occurs while registering extension :-(
 			$ret = false;
 		}
-	}
-	 elseif (($id > 0) && (!empty($ext_name)))
-	{
+	} elseif (($id > 0) && (!empty($ext_name))) {
 		// Remove task from system when id and extension's name is valid
-		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%d AND status='NEW' LIMIT 1",
+		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND status='NEW' LIMIT 1",
 		 array(bigintval($id)), __FILE__, __LINE__);
 	}
+
+	// Is this the sql_patches?
+	//* DEBUG: */ echo __LINE__.":{$ext_name}/{$EXT_LOAD_MODE}<br />\n";
+	if (($ext_name == "sql_patches") && (($EXT_LOAD_MODE == "register") || ($EXT_LOAD_MODE == "remove")) && (!$dry_run) && ($test)) {
+		// Then redirect to logout
+		//* DEBUG: */ echo __LINE__.": LOAD!<br />\n";
+		LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
+	} // END - if
+
 	// Return status code
 	return $ret;
 }
 //
-function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE)
-{
-	global $CACHE;
+function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
+	global $cacheInstance, $_CONFIG;
+	$SQLs = array();
+
+	// By default no SQL has been executed
+	$sqlRan = false;
+
 	// This shall never do a non-admin user!
 	if (!IS_ADMIN()) return false;
 
 	// Get extension's name
-	$result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
-	 array(bigintval($id)), __FILE__, __LINE__);
-	list($ext_name) = SQL_FETCHROW($result);
-	SQL_FREERESULT($result);
+	$ext_name = GET_EXT_NAME($id);
 	if (empty($ext_name)) return false;
 
 	// Load extension in detected mode
-	$file = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name); $SQLs = array();
-	if (file_exists($file) && is_readable($file)) require($file);
-	if ((is_array($SQLs) && (sizeof($SQLs) > 0)))
-	{
+	//* DEBUG: */ echo __FUNCTION__.":ext_name[{$id}]={$ext_name}<br />\n";
+	$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
+	if (FILE_READABLE($file)) {
+		// Load the include
+		require($file);
+	} // END - if
+
+	//* DEBUG: */ echo __FUNCTION__.":SQLs::count=".count($SQLs)."<br />\n";
+	if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
 		// Run SQL commands...
 		foreach ($SQLs as $sql) {
 			// Trim spaces away which we don't need
@@ -248,93 +272,117 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE)
 
 			// Is there still an SQL query?
 			if (!empty($sql)) {
-				// Run SQL command
-				$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
-			}
-		}
+				// Do we have an "ALTER TABLE" command?
+				//* DEBUG: */ echo __FUNCTION__.":SQL={$SQL}<br />\n";
+				if (substr(strtolower($sql), 0, 11) == "alter table") {
+					// Analyse the alteration command
+					SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
+				} else {
+					// Run regular SQL command
+					$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
+				}
+
+				// An SQL has been executed
+				$sqlRan = true;
+			} // END - if
+		} // END - foreach
+
+		// Removal mode?
+		if ($EXT_LOAD_MODE == "remove") {
+			// Delete this extension (remember to remove it from your server *before* you click on welcome!
+			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
+			 array($id), __FILE__, __LINE__);
+		} // END - if
+
+		//* DEBUG: */ echo __FUNCTION__.":mode={$EXT_LOAD_MODE}<br />\n";
 
 		// Remove cache file(s) if extension is active
-		if (EXT_IS_ACTIVE("cache")) {
-			// Remove cache filer
-			if ($CACHE->cache_file("extensions", true)) $CACHE->cache_destroy();
-			if ($CACHE->cache_file("mod_reg", true))    $CACHE->cache_destroy();
-			if ($CACHE->cache_file("config", true))     $CACHE->cache_destroy();
-		}
-	}
+		if (((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) && (((SQL_AFFECTEDROWS() == 1) && ($EXT_LOAD_MODE == "remove")) || ($sqlRan === true))) {
+			//* DEBUG: */ echo __LINE__.": DESTROY!<br />\n";
+			// Remove cache files
+			if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
+			if ($cacheInstance->cache_file("mod_reg", true))    $cacheInstance->cache_destroy();
+			if ($cacheInstance->cache_file("config", true))     $cacheInstance->cache_destroy();
+
+			// @TODO This causes the whole (!) menu cache being purged
+			CACHE_PURGE_ADMIN_MENU();
+		} // END - if
+
+		// Is this the sql_patches?
+		//* DEBUG: */ echo __LINE__.": {$id}/{$ext_name}/{$EXT_LOAD_MODE}<br />\n";
+		if (($ext_name == "sql_patches") && (($EXT_LOAD_MODE == "register") || ($EXT_LOAD_MODE == "remove"))) {
+			// Then redirect to logout
+			//* DEBUG: */ echo __LINE__.": LOAD!<br />\n";
+			LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
+		} // END - if
+	} // END - if
 }
-//
-function EXT_IS_ACTIVE ($ext_name, $ignore_admin=false, $ignore_cache=false)
-{
-	global $EXTENSIONS, $CONFIG;
+// Check if given extension is active
+function EXT_IS_ACTIVE ($ext_name) {
+	global $cacheArray, $_CONFIG;
 
 	// Extensions are all inactive during installation
-	if ((!mxchange_installed) || (mxchange_installing) || (empty($ext_name))) return false;
+	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
 
-	// Extension's file name will also be checked
-	$file = PATH."inc/extensions/ext-".$ext_name.".php";
-	if ((!file_exists($file)) && (!is_readable($file))) return false;
-	//* DEBUG: */ echo "*".$ext_name."*<br />";
+	// Not active is the default
+	$active = "N";
 
-	// Failed is the default
-	$ret = false;
-	if ((!empty($EXTENSIONS['ext_active'][$ext_name])) && (!$ignore_cache))
-	{
+	// Check cache
+	if (!empty($cacheArray['extensions']['ext_active'][$ext_name])) {
 		// Load from cache
-		$active = $EXTENSIONS['ext_active'][$ext_name];
+		//* DEBUG: */ echo "CACHE! ext_name={$ext_name}<br />\n";
+		$active = $cacheArray['extensions']['ext_active'][$ext_name];
 
 		// Count cache hits
-		if (isset($CONFIG['cache_hits'])) $CONFIG['cache_hits']++;
-	}
-	 else
-	{
+		if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++;
+	} elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
+		//* DEBUG: */ echo "DB! ext_name={$ext_name}<br />\n";
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_active FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
 		 array($ext_name), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 0)
-		{
+		if (SQL_NUMROWS($result) == 0) {
 			// Extension was not found!
 			return false;
 		}
 		list($active) = SQL_FETCHROW($result);
+		//* DEBUG: */ echo $ext_name."[DB]: {$active}<br />\n";
 		SQL_FREERESULT($result);
 
 		// Write cache array
-		$EXTENSIONS['ext_active'][$ext_name] = $active;
+		$cacheArray['extensions']['ext_active'][$ext_name] = $active;
+	} else {
+		// Extension not active!
+		//* DEBUG: */ echo $ext_name.": Not active!<br />\n";
+		$cacheArray['extensions']['ext_active'][$ext_name] = "N";
 	}
 
+	// Create FQFN for extension file
+	$inc = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
+
+	// Debug message
+	//DEBUG_LOG(__FUNCTION__.": ext_name={$ext_name},active={$active}");
+
 	// Is this extension activated? (For admins we always have active extensions...)
-	$inc = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name);
-	// Shorter way
-	return (
-		(
-			($active == 'Y') || (
-				(IS_ADMIN()) &&
-				(!$ignore_admin) &&
-				(!empty($active))
-			)
-		) && (
-			file_exists($inc)
-		) && (
-			is_readable($inc)
-		)
-	);
+	return ($active == "Y");
 }
 // Get version from extensions
 function GET_EXT_VERSION ($ext_name) {
-	global $EXTENSIONS, $CONFIG, $CACHE;
+	global $cacheArray, $_CONFIG, $cacheInstance;
 	$ret = false;
 
 	// Extensions are all inactive during installation
-	if ((!mxchange_installed) || (mxchange_installing)) return "";
+	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
+	//* DEBUG: */ echo __FUNCTION__.": ext_name={$ext_name}<br />\n";
 
 	// Is the cache written?
-	if (!empty($EXTENSIONS['ext_version'][$ext_name])) {
+	if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
 		// Load data from cache
-		$ret = $EXTENSIONS['ext_version'][$ext_name];
+		//* DEBUG: */ echo __FUNCTION__.": CACHE!<br />\n";
+		$ret = $cacheArray['extensions']['ext_version'][$ext_name];
 
 		// Count cache hits
-		if (isset($CONFIG['cache_hits'])) $CONFIG['cache_hits']++; else $CONFIG['cache_hits'] = 1;
-	} elseif (!is_object($CACHE)) {
+		if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++; else $_CONFIG['cache_hits'] = 1;
+	} elseif (!is_object($cacheInstance)) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_version FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
 		 array($ext_name), __FILE__, __LINE__);
@@ -342,22 +390,32 @@ function GET_EXT_VERSION ($ext_name) {
 		SQL_FREERESULT($result);
 
 		// Set cache
-		$EXTENSIONS['ext_version'][$ext_name] = $ret;
+		$cacheArray['extensions']['ext_version'][$ext_name] = $ret;
 	}
+
+	// Return result
+	//* DEBUG: */ echo __FUNCTION__.": ret={$ret}<br />\n";
 	return $ret;
 }
 //
 function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 {
 	// This shall never do a non-admin user!
-	global $CACHE, $CONFIG, $NOTES; $SQLs = array();
+	global $cacheInstance, $_CONFIG, $NOTES;
+
+	// Init arrays
+	$SQLs = array(); $INC_POOL = array();
+
+	// Only admins are allowed to update extensions
 	if ((!IS_ADMIN()) || (empty($ext))) return false;
 
 	// Load extension in update mode
 	$EXT_LOAD_MODE = "update"; $EXT_UPDATE_DEPENDS = ""; $NOTES = "";
-	include(PATH."inc/extensions/".$file);
-	if (!empty($EXT_UPDATE_DEPENDS))
-	{
+
+	// Load extension file
+	include(sprintf("%sinc/extensions/%s", PATH, $file));
+
+	if (!empty($EXT_UPDATE_DEPENDS)) {
 		// Update another extension first!
 		$test = EXTENSION_UPDATE(("ext-".$EXT_UPDATE_DEPENDS.".php"), $EXT_UPDATE_DEPENDS, GET_EXT_VERSION($EXT_UPDATE_DEPENDS), $dry_run);
 	}
@@ -382,7 +440,7 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 			include(PATH."inc/extensions/".$file);
 
 			// Add notes
-			if ($CONFIG['verbose_sql'] == 'Y')
+			if ($_CONFIG['verbose_sql'] == "Y")
 			{
 				$EXT_VER = $EXT_VER_HISTORY[$idx];
 				if (!empty($UPDATE_NOTES))
@@ -402,17 +460,30 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 				}
 			}
 
+			// In real-mode execute any existing includes
+			if ((!$dry_run) && (count($INC_POOL) > 0)) {
+				// Include all files
+				foreach ($INC_POOL as $fqfn) {
+					require_once($fqfn);
+				} // END - foreach
+			} // END - if
+
 			// Run SQLs
-			if ((is_array($SQLs)) && (!$dry_run))
-			{
+			if ((is_array($SQLs)) && (!$dry_run)) {
 				// Run SQL commands
 				foreach ($SQLs as $sql)
 				{
 					$sql = trim($sql);
 					if (!empty($sql))
 					{
-						// Run SQL command...
-						$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
+						// Do we have an "ALTER TABLE" command?
+						if (substr(strtolower($sql), 0, 11) == "alter table") {
+							// Analyse the alteration command
+							SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
+						} else {
+							// Run regular SQL command
+							$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
+						}
 					}
 				}
 			} elseif (GET_EXT_VERSION("sql_patches") == "") {
@@ -427,49 +498,34 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 			$ext_subj = "[UPDATE-".$ext."-".$EXT_VERSION.":] ".ADMIN_UPDATE_EXT_SUBJ;
 
 			// Create task
-			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE subject='%s' LIMIT 1",
-			 array($ext_subj), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 0)
-			{
-				// Task not created so it's a brand-new extension which we need to register and create a task for!
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'EXTENSION_UPDATE', '%s', '%s', UNIX_TIMESTAMP())",
-				 array(GET_ADMIN_ID(SQL_ESCAPE($_COOKIE['admin_login'])), $ext_subj, addslashes($NOTES)), __FILE__, __LINE__);
-			}
-
-			// Free memory
-			SQL_FREERESULT($result);
+			CREATE_EXTENSION_UPDATE_TASK(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, addslashes($NOTES));
 
 			// Update extension's version
 			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
 			 array($EXT_VERSION, $ext), __FILE__, __LINE__);
 
 			// Update cache
-			if (EXT_IS_ACTIVE("cache"))
-			{
-				if ($CACHE->cache_file("extensions", true) == true) $CACHE->cache_destroy();
-				if ($CACHE->cache_file("config", true) == true)     $CACHE->cache_destroy();
-				if ($CACHE->cache_file("mod_reg", true) == true)    $CACHE->cache_destroy();
-			}
+			if (EXT_IS_ACTIVE("cache")) {
+				if ($cacheInstance->cache_file("extensions", true) == true) $cacheInstance->cache_destroy();
+				if ($cacheInstance->cache_file("config", true) == true)     $cacheInstance->cache_destroy();
+				if ($cacheInstance->cache_file("mod_reg", true) == true)    $cacheInstance->cache_destroy();
+			} // END - if
 
 			// Remove array
 			unset($SQLs);
-		}
-		 else
-		{
+		} else {
 			// In "dry-run" mode return array with SQL commands
 			return $SQLs;
 		}
 	}
 }
 //
-function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed="", $switch=false, $WIDTH="480")
-{
-	global $CONFIG;
+function EXTENSION_VERBOSE_TABLE($SQLs, $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed = "", $switch = false, $WIDTH = "480") {
+	global $_CONFIG;
 
 	$S = false; $SW = 2; $i = 1;
 	$OUT = "";
-	if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == 'Y'))
-	{
+	if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && ($_CONFIG['verbose_sql'] == "Y")) {
 		$OUT  = "<DIV align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"".$WIDTH."\" align=\"center\"".$dashed.">
 <TR>
@@ -477,11 +533,9 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $
     <STRONG>".$title.":</STRONG>
   </TD>
 </TR>\n";
-		foreach ($SQLs as $idx=>$sql)
-		{
+		foreach ($SQLs as $idx => $sql) {
 			$sql = trim($sql);
-			if (!empty($sql))
-			{
+			if (!empty($sql)) {
 				$S = true;
 				$OUT .= "<TR>
   <TD class=\"switch_sw".(3 - $SW)." bottom2\" style=\"padding-left: 2px\" width=\"30\">".$i.".</TD>
@@ -495,8 +549,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $
 		}
 	}
 
-	if ((!$S) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == 'Y'))
-	{
+	if ((!$S) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && ($_CONFIG['verbose_sql'] == "Y")) {
 		// No addional SQL commands to run
 		$OUT .= "<TR>
   <TD colspan=\"2\" align=\"center\" class=\"switch_sw2 bottom2\" height=\"24\">
@@ -510,53 +563,74 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $
 		$OUT .= "</TABLE>
 </DIV>\n";
 	}
+
+	// Return output
 	return $OUT;
 }
-//
-function GET_EXT_NAME($id)
-{
+// Get extension name from id
+function GET_EXT_NAME ($id) {
 	$ret = "";
-	global $EXTENSIONS, $CONFIG;
-	if (!empty($EXTENSIONS['ext_id'][$id]))
-	{
+	global $cacheArray, $_CONFIG;
+	if (!empty($cacheArray['extensions']['ext_name'][$id])) {
 		// Load from cache
-		$ret = $EXTENSIONS['ext_id'][$id];
+		$ret = $cacheArray['extensions']['ext_name'][$id];
 
 		// Count cache hits
-		$CONFIG['cache_hits']++;
-	}
-	 else
-	{
+		$_CONFIG['cache_hits']++;
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
 		 array(bigintval($id)), __FILE__, __LINE__);
 		list($ret) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
 	return $ret;
 }
-//
-function GET_EXT_ID($name)
-{
-	$ret = "0";
-	global $EXTENSIONS, $CONFIG;
-	if ((isset($EXTENSIONS['ext_id'])) && (is_array($EXTENSIONS['ext_id'])))
-	{
+// Get extension id from name
+function GET_EXT_ID($name) {
+	$ret = 0;
+	global $cacheArray, $_CONFIG;
+	if (isset($cacheArray['extensions']['ext_id'][$name])) {
 		// Load from cache
-		$ret = array_search($name, $EXTENSIONS['ext_id']);
+		$ret = $cacheArray['extensions']['ext_id'][$name];
 
 		// Count cache hits
-		$CONFIG['cache_hits']++;
-	}
-	 else
-	{
+		$_CONFIG['cache_hits']++;
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
 		 array($name), __FILE__, __LINE__);
 		list($ret) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
+
+	// Return value
 	return $ret;
 }
+// Activate given extension
+function ACTIVATE_EXTENSION($ext_name) {
+	// Activate the extension
+	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
+		array($ext_name), __FILE__, __LINE__);
+
+	// Extension has been activated?
+	if (SQL_AFFECTEDROWS() == 1) {
+		// Then run all queries
+		EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), "activate");
+	} // END - if
+}
+// Checks wether the extension is older than given
+function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) {
+	// Get current extension version
+	$currVersion = GET_EXT_VERSION($ext_name);
+
+	// Remove all dots from both versions
+	$currVersion = str_replace(".", "", $currVersion);
+	$ext_ver = str_replace(".", "", $ext_ver);
+
+	// Now compare both and return the result
+	return ($currVersion < $ext_ver);
+}
+
 //
 ?>