X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=8be7feba1048bd7e43f14930d50f0c56961e8636;hb=769d7314f3dd962b40373d0e5fa67f0815d698c9;hp=970e0a71ad57cabdcc4a61aa4d0ba088b98ba384;hpb=efe6057fdb1c02a518172e985298e66accef90d0;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 970e0a71ad..8be7feba10 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // 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)
 {
@@ -55,87 +55,86 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 	$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
+		$EXT_ALWAYS_ACTIVE = "N";
 		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";
+			$LANG_BCK = $EXT_LANG_PREFIX;
+			$EXT_ALWAYS_ACTIVE = "N";
 
 			// Load required extension also in update mode
 			$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;
+				$EXT_ALWAYS_ACTIVE = "N";
 				require($file);
 				$EXT_VERSION = $VER_BACKUP;
 
 				// 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...
@@ -144,9 +143,7 @@ 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;
 		}
@@ -191,17 +188,26 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 					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', '%s', '%s')",
+				$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
 				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);
+				$ret = true;
+
+				// Remove SQLs
+				unset($SQLs);
 			} else {
 				// Rewrite SQL command to keep { and } inside
 				foreach ($SQLs as $key => $sql) {
@@ -238,9 +244,15 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 }
 //
 function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
-	global $cacheInstance;
+	global $cacheInstance, $_CONFIG;
 	$SQLs = array();
 
+	// Extensions are never active by default
+	$EXT_ALWAYS_ACTIVE = "N";
+
+	// By default no SQL has been executed
+	$sqlRan = false;
+
 	// This shall never do a non-admin user!
 	if (!IS_ADMIN()) return false;
 
@@ -249,9 +261,14 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 	if (empty($ext_name)) return false;
 
 	// Load extension in detected mode
+	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ext_name[{$id}]={$ext_name}<br />\n";
 	$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-	if (file_exists($file) && is_readable($file)) require($file);
+	if (FILE_READABLE($file)) {
+		// Load the include
+		require($file);
+	} // END - if
 
+	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):SQLs::count=".count($SQLs)."<br />\n";
 	if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
 		// Run SQL commands...
 		foreach ($SQLs as $sql) {
@@ -261,6 +278,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 			// Is there still an SQL query?
 			if (!empty($sql)) {
 				// Do we have an "ALTER TABLE" command?
+				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):SQL={$SQL}<br />\n";
 				if (substr(strtolower($sql), 0, 11) == "alter table") {
 					// Analyse the alteration command
 					SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
@@ -268,6 +286,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 					// Run regular SQL command
 					$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
 				}
+
+				// An SQL has been executed
+				$sqlRan = true;
 			} // END - if
 		} // END - foreach
 
@@ -278,14 +299,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 			 array($id), __FILE__, __LINE__);
 		} // END - if
 
-		// 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
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):mode={$EXT_LOAD_MODE}<br />\n";
 
 		// Is this the sql_patches?
 		//* DEBUG: */ echo __LINE__.": {$id}/{$ext_name}/{$EXT_LOAD_MODE}<br />\n";
@@ -295,32 +309,39 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 			LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
 		} // END - if
 	} // END - if
+
+	// Remove cache file(s) if extension is active
+	if (((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) && (((SQL_AFFECTEDROWS() == 1)) || ($sqlRan === true) || ($EXT_LOAD_MODE == "activate") || ($EXT_LOAD_MODE == "deactivate"))) {
+		//* 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
 }
 // Check if given extension is active
-function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false) {
+function EXT_IS_ACTIVE ($ext_name) {
 	global $cacheArray, $_CONFIG;
 
 	// Extensions are all inactive during installation
 	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
 
-	// Extension's file name will also be checked
-	$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-	if ((!file_exists($file)) && (!is_readable($file))) return false;
-	//* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")<br />";
-
 	// Not active is the default
 	$active = "N";
 
 	// Check cache
-	if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) {
+	if (!empty($cacheArray['extensions']['ext_active'][$ext_name])) {
 		// Load from cache
-		//* DEBUG: */ echo "CACHE!<br />\n";
+		//* 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']++;
 	} elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
-		//* DEBUG: */ echo "DB!<br />\n";
+		//* 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__);
@@ -328,11 +349,16 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
 			// Extension was not found!
 			return false;
 		}
+
+		// Load entry
 		list($active) = SQL_FETCHROW($result);
-		//* DEBUG: */ echo $ext_name."[DB]: {$active}<br />\n";
+
+		// Free result
 		SQL_FREERESULT($result);
 
+
 		// Write cache array
+		//* DEBUG: */ echo $ext_name."[DB]: {$active}<br />\n";
 		$cacheArray['extensions']['ext_active'][$ext_name] = $active;
 	} else {
 		// Extension not active!
@@ -340,22 +366,11 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
 		$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...)
-	return (
-		(
-			$active == "Y"
-		) && (
-			file_exists($inc)
-		) && (
-			is_readable($inc)
-		)
-	);
+	return ($active == "Y");
 }
 // Get version from extensions
 function GET_EXT_VERSION ($ext_name) {
@@ -364,10 +379,12 @@ function GET_EXT_VERSION ($ext_name) {
 
 	// Extensions are all inactive during installation
 	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
+	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ext_name={$ext_name}<br />\n";
 
 	// Is the cache written?
 	if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
 		// Load data from cache
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): CACHE!<br />\n";
 		$ret = $cacheArray['extensions']['ext_version'][$ext_name];
 
 		// Count cache hits
@@ -382,20 +399,30 @@ function GET_EXT_VERSION ($ext_name) {
 		// Set cache
 		$cacheArray['extensions']['ext_version'][$ext_name] = $ret;
 	}
+
+	// Return result
+	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): 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 $cacheInstance, $_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);
 	}
@@ -440,9 +467,16 @@ 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)
 				{
@@ -498,7 +532,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL,
 
 	$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>
@@ -522,7 +556,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\">
@@ -549,7 +583,7 @@ function GET_EXT_NAME ($id) {
 		$ret = $cacheArray['extensions']['ext_name'][$id];
 
 		// Count cache hits
-		$_CONFIG['cache_hits']++;
+		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
@@ -568,7 +602,7 @@ function GET_EXT_ID($name) {
 		$ret = $cacheArray['extensions']['ext_id'][$name];
 
 		// Count cache hits
-		$_CONFIG['cache_hits']++;
+		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
@@ -580,5 +614,30 @@ function GET_EXT_ID($name) {
 	// 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);
+}
+
 //
 ?>