X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-modreg.php;h=b37d67f01777f11cd4101da2ef51d667a81c299c;hb=444470f309a050293341c95917beb89d60a394b9;hp=8e42ddae4639fb4bcd82ffea4886cfe46598ce9f;hpb=41e2891fb998d13b22b8d7984358f258cc85267d;p=mailer.git

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 8e42ddae46..b37d67f017 100644
--- a/inc/loader/load_cache-modreg.php
+++ b/inc/loader/load_cache-modreg.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,82 +37,68 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Next cached table is the module registry (mod_reg)...
-if ($cacheInstance->cache_file("mod_reg", true) == true) {
+if (($GLOBALS['cache_instance']->loadCacheFile('modreg')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
 	// Load cache
-	global $cacheArray;
-	$cacheArray['modules'] = $cacheInstance->cache_load();
-
-	// Valid cache file
-	$CNT = 0;
-	foreach ($cacheArray['modules'] as $k => $array) {
-		$CNT += count($array);
-	}
+	$GLOBALS['cache_array']['modules'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
-	// When there is a period (.) in the result this test will fail and so the cache file is
-	// damaged/corrupted
-	$TEST = "failed";
-	if (count($cacheArray['modules']) > 0 ) $TEST = ($CNT / (count($cacheArray['modules'])));
-	if ($TEST != bigintval($TEST)) {
-		// Cache file is corrupted!
-		$cacheInstance->cache_destroy();
-		unset($cacheArray['modules']);
-	} else {
-		// Rewrite module cache
-		$modArray = $cacheArray['modules'];
-		foreach ($modArray['module'] as $key => $mod) {
-			$cacheArray['modules']['id'][$mod] = $modArray['id'][$key];
-			unset($cacheArray['modules']['id'][$key]);
-			$cacheArray['modules']['title'][$mod] = $modArray['title'][$key];
-			unset($cacheArray['modules']['title'][$key]);
-			$cacheArray['modules']['locked'][$mod] = $modArray['locked'][$key];
-			unset($cacheArray['modules']['locked'][$key]);
-			$cacheArray['modules']['hidden'][$mod] = $modArray['hidden'][$key];
-			unset($cacheArray['modules']['hidden'][$key]);
-			$cacheArray['modules']['admin_only'][$mod] = $modArray['admin_only'][$key];
-			unset($cacheArray['modules']['admin_only'][$key]);
-			$cacheArray['modules']['mem_only'][$mod] = $modArray['mem_only'][$key];
-			unset($cacheArray['modules']['mem_only'][$key]);
-			if (isset($cacheArray['modules']['has_menu'][$key])) {
-				$cacheArray['modules']['has_menu'][$mod] = $modArray['has_menu'][$key];
-				unset($cacheArray['modules']['has_menu'][$key]);
-			} // END - if
-		}
-		unset($modArray);
-	}
-} elseif (($_CONFIG['cache_modreg'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+	// Rewrite module cache
+	$modArray = $GLOBALS['cache_array']['modules'];
+	foreach ($modArray['module'] as $key => $mod) {
+		$GLOBALS['cache_array']['modules']['id'][$mod] = $modArray['id'][$key];
+		unset($GLOBALS['cache_array']['modules']['id'][$key]);
+		$GLOBALS['cache_array']['modules']['title'][$mod] = $modArray['title'][$key];
+		unset($GLOBALS['cache_array']['modules']['title'][$key]);
+		$GLOBALS['cache_array']['modules']['locked'][$mod] = $modArray['locked'][$key];
+		unset($GLOBALS['cache_array']['modules']['locked'][$key]);
+		$GLOBALS['cache_array']['modules']['hidden'][$mod] = $modArray['hidden'][$key];
+		unset($GLOBALS['cache_array']['modules']['hidden'][$key]);
+		$GLOBALS['cache_array']['modules']['admin_only'][$mod] = $modArray['admin_only'][$key];
+		unset($GLOBALS['cache_array']['modules']['admin_only'][$key]);
+		$GLOBALS['cache_array']['modules']['mem_only'][$mod] = $modArray['mem_only'][$key];
+		unset($GLOBALS['cache_array']['modules']['mem_only'][$key]);
+		if (isset($GLOBALS['cache_array']['modules']['has_menu'][$key])) {
+			$GLOBALS['cache_array']['modules']['has_menu'][$mod] = $modArray['has_menu'][$key];
+			unset($GLOBALS['cache_array']['modules']['has_menu'][$key]);
+		} // END - if
+	} // END - foreach
+	unset($modArray);
+} elseif ((getConfig('cache_modreg') == 'Y') && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
 	// Create cache file here
-	$cacheInstance->cache_init("MODULES");
+	$GLOBALS['cache_instance']->init('MODULES');
+	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 
 	// Load all modules and their data
-	if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
+	if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
 		// Load has_menu
-		$result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
-FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`', __FILE__, __LINE__);
 	} else {
 		// Don't load has_menu
-		$result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only
-FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT id, module, title, locked, hidden, admin_only, title, mem_only
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`', __FILE__, __LINE__);
 	}
-	while ($DATA = SQL_FETCHARRAY($result)) {
+
+	// Cache all data
+	while ($data = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$cacheInstance->add_row($DATA);
-	}
+		$GLOBALS['cache_instance']->addRow($data);
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
-	// Reload the cache
+	// Close the cache
+	$GLOBALS['cache_instance']->finalize();
+
+	// Include loader again
 	require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>