X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_extensions.php;h=87f1179fb1e3d431d2e58342842f350b4c80184b;hb=aa27f7442553d0a8341e5611d70b8e4521bbce03;hp=f804ae6baf432de38bee76b823bffd488ccc387a;hpb=61b77b466ed51b55406cce2671c6ad3991b350a9;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index f804ae6baf..87f1179fb1 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -36,7 +36,8 @@ if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
-//
+
+// Init variables
 global $EXT_CSS_FILES;
 $EXT_CSS_FILES = array();
 $ADD = "";
@@ -63,28 +64,46 @@ if (EXT_IS_ACTIVE("cache")) {
 	include_once(PATH."inc/libs/cache_functions.php");
 	$cacheMode = "";
 	include_once(PATH."inc/extensions/ext-cache.php");
-	switch($cacheInstance->cache_file("extensions", true)) {
+	switch (($cacheInstance->cache_file("extensions", true)) && ($cacheInstance->ext_version_matches("sql_patches"))) {
 		case true : $cacheMode = "load"; break;
 		case false: $cacheMode = "init"; break;
 	}
 
 	// Do not recreate cache file when it's switched off!
-	if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == "N")) $cacheMode = "skip";
 
-	// Load language
-	if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
+	// If we need to init the cache init it now
+	if ($cacheMode == "init") {
+		// Init cache file
+		$cacheInstance->cache_init("EXTENSIONS");
+		$cacheInstance->store_extension_version("sql_patches");
+
+		if ($_CONFIG['cache_exts'] == "N") $cacheMode = "skip";
+	} // END - if
 } else {
 	// Cache extension not active
 	$cacheMode = "no";
 }
 
+// Load cache?
 if ($cacheMode == "load") {
+	// Init include array
+	$EXT_POOL = array();
+
 	// Re-initialize handler
 	$cacheInstance->cache_file("extensions", true);
 
 	// Load extension data from cache file
 	$EXT_DUMMY = $cacheInstance->cache_load();
 
+	// Is the cache file fine?
+	if (!isset($EXT_DUMMY['ext_name'])) {
+		// Cache file is damaged so kill it
+		$cacheInstance->cache_destroy();
+
+		// Skip any further execution
+		return;
+	} // END -  if
+
 	// Begin with the cache preparation of extensions
 	$EXT_NAMES = array();
 	foreach ($EXT_DUMMY['ext_name'] as $k => $name) {
@@ -96,7 +115,10 @@ if ($cacheMode == "load") {
 		// Load Language file
 		if ($EXT_DUMMY['ext_lang'][$k] == "Y") {
 			$INC = sprintf("%sinc/language/%s_%s.php", PATH, $name, GET_LANGUAGE());
-			if (FILE_READABLE($INC)) require_once($INC);
+			if (FILE_READABLE($INC)) {
+				// Add it
+				$EXT_POOL[] = $INC;
+			} // END -  if
 		} // END - if
 
 		// Load CSS file
@@ -104,18 +126,21 @@ if ($cacheMode == "load") {
 
 		// Load extension file itself
 		if (($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) {
-			require_once(PATH."inc/extensions/ext-".$name.".php");
+			$EXT_POOL[] = sprintf("%sinc/extensions/ext-%s.php", PATH, $name);
 		} // END - if
 
 		// Version number
 		$EXT_DUMMY['ext_version'][$name] = $EXT_DUMMY['ext_version'][$k];
 		unset($EXT_DUMMY['ext_version'][$k]);
+
 		// Extension is active
 		$EXT_DUMMY['ext_active'][$name] = $EXT_DUMMY['ext_active'][$k];
 		unset($EXT_DUMMY['ext_active'][$k]);
+
 		// Ext menu
 		$EXT_DUMMY['ext_menu'][$name] = $EXT_DUMMY['ext_menu'][$k];
 		unset($EXT_DUMMY['ext_menu'][$k]);
+
 		// Extension id
 		$EXT_DUMMY['ext_id'][$name] = $EXT_DUMMY['ext_id'][$k];
 		$id = $EXT_DUMMY['ext_id'][$name];
@@ -154,9 +179,18 @@ if ($cacheMode == "load") {
 
 	// Load more cache files (like admins)
 	require_once(PATH."inc/load_cache.php");
+
+	// Load all extension files
+	foreach ($EXT_POOL as $inc) {
+		require_once($inc);
+	} // END - foreach
+
+	// Remove array
+	unset($EXT_POOL);
 } else {
-	// If current user is not admin load only activated extensions
-	// The admin shall use every available extension for testing purposes
+	// If current user is not admin load only activated extensions. But load
+	// them all if we are going to init the cache files. The admin shall use
+	// every available extension for testing purposes.
 	if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
 
 	if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
@@ -165,7 +199,7 @@ if ($cacheMode == "load") {
 FROM "._MYSQL_PREFIX."_extensions".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
 	} else {
-		// Old obsulete query string
+		// Old obsolete query string
 		$res_ext_crt = SQL_QUERY("SELECT id, ext_name, ext_lang_file, ext_name, ext_active, ext_version
 FROM "._MYSQL_PREFIX."_extensions".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
@@ -176,13 +210,10 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode == "no")) && ($CSS != "1") && ($CSS != "-1")) {
+if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1") && ($CSS != "-1")) || ($cacheMode == "no"))) {
 	// Load theme management
 	require_once(PATH."inc/theme-manager.php");
 
-	// If we need to init the cache init it now
-	if ($cacheMode == "init") $cacheInstance->cache_init("EXTENSIONS");
-
 	// Extensions are registered so we load them
 	while (list($EXT_ID, $name, $lang, $css, $active, $version) = SQL_FETCHROW($res_ext_crt)) {
 		// Get menu entry
@@ -278,7 +309,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
 
 	// Free memory
 	SQL_FREERESULT($res_ext_crt);
-}
+} // END - if
 
 // Load include files if found
 if (!empty($INC_POOL[0])) {