X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-modreg.php;h=9aa642ca065495d544267875615aa2ccab321ba1;hb=aa9dc775802a1fb8030d232c54cc5732dc6082ae;hp=351550fee58cb6b8571e4a51f9aa279a54c60add;hpb=747c49b9f46a3d7d1d881c9e1c273ecf107f8d8b;p=mailer.git

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 351550fee5..9aa642ca06 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                  *
@@ -37,65 +42,61 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-// Make cacheInstance global
-global $cacheInstance;
-
 // Next cached table is the module registry (mod_reg)...
-if (($cacheInstance->loadCacheFile("mod_reg")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("modreg")) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
 	// Load cache
-	global $cacheArray;
-	$cacheArray['modules'] = $cacheInstance->getArrayFromCache();
+	$GLOBALS['cache_array']['modules'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Rewrite module cache
-	$modArray = $cacheArray['modules'];
+	$modArray = $GLOBALS['cache_array']['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]);
+		$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") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_modreg') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 	// Create cache file here
-	$cacheInstance->init("MODULES");
-	$cacheInstance->storeExtensionVersion("sql_patches");
+	$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") {
 		// 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__);
+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__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);
 	}
 
 	// Cache all data
 	while ($data = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$cacheInstance->addRow($data);
+		$GLOBALS['cache_instance']->addRow($data);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Close the cache
-	$cacheInstance->finalize();
+	$GLOBALS['cache_instance']->finalize();
 
-	// Reload the cache
+	// Include loader again
 	require(__FILE__);
 }