X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=168a3ae9cc5708bbd3feb9c34e30d91b3e655747;hb=8ba389b59f6d41f88752cae896143135e575f34a;hp=17dbf7d6d4aaf5c3e1a97527f880e2786c57eba1;hpb=df8cb42d2d579310d1ccfb562b8f30eafdb2618e;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 17dbf7d6d4..168a3ae9cc 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,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;
@@ -191,7 +191,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 					foreach ($INC_POOL as $inc) {
 						require_once($inc);
 					} // END - foreach
-				}
+				} // 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')",
@@ -200,8 +200,14 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 				// 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) {
@@ -254,7 +260,10 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 	// 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))) {
@@ -296,6 +305,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 			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?
@@ -308,30 +320,25 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
 	} // 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__);
@@ -358,15 +365,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
 	//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) {