X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=1250799913ba3902275615a04a0d515430a4b3b7;hb=572e4b0f128dc3e7c44331d21f366fb8b19665e4;hp=970e0a71ad57cabdcc4a61aa4d0ba088b98ba384;hpb=efe6057fdb1c02a518172e985298e66accef90d0;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 970e0a71ad..1250799913 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -55,7 +55,7 @@ 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
 		require($file);
@@ -98,7 +98,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 			$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;
@@ -241,6 +241,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 	global $cacheInstance;
 	$SQLs = array();
 
+	// By default no SQL has been executed
+	$sqlRan = false;
+
 	// This shall never do a non-admin user!
 	if (!IS_ADMIN()) return false;
 
@@ -249,9 +252,14 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 	if (empty($ext_name)) return false;
 
 	// Load extension in detected mode
+	//* DEBUG: */ echo __FUNCTION__.":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);
+	}
 
+	//* DEBUG: */ echo __FUNCTION__.":SQLs::count=".count($SQLs)."<br />\n";
 	if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
 		// Run SQL commands...
 		foreach ($SQLs as $sql) {
@@ -261,6 +269,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: */ echo __FUNCTION__.":SQL={$SQL}<br />\n";
 				if (substr(strtolower($sql), 0, 11) == "alter table") {
 					// Analyse the alteration command
 					SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
@@ -268,6 +277,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,8 +290,10 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 			 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")) || (GET_EXT_VERSION("cache") != "")) {
+		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();
@@ -305,7 +319,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = 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;
+	if (!FILE_READABLE($file)) return false;
 	//* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")<br />";
 
 	// Not active is the default
@@ -351,9 +365,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
 		(
 			$active == "Y"
 		) && (
-			file_exists($inc)
-		) && (
-			is_readable($inc)
+			FILE_READABLE($inc)
 		)
 	);
 }
@@ -364,10 +376,12 @@ function GET_EXT_VERSION ($ext_name) {
 
 	// Extensions are all inactive during installation
 	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
+	//* DEBUG: */ echo __FUNCTION__.": ext_name={$ext_name}<br />\n";
 
 	// Is the cache written?
 	if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
 		// Load data from cache
+		//* DEBUG: */ echo __FUNCTION__.": CACHE!<br />\n";
 		$ret = $cacheArray['extensions']['ext_version'][$ext_name];
 
 		// Count cache hits
@@ -382,6 +396,9 @@ function GET_EXT_VERSION ($ext_name) {
 		// Set cache
 		$cacheArray['extensions']['ext_version'][$ext_name] = $ret;
 	}
+
+	// Return result
+	//* DEBUG: */ echo __FUNCTION__.": ret={$ret}<br />\n";
 	return $ret;
 }
 //