X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-modules.php;h=64a99d3f8bb9f82fcf6446952396e1679edc7aab;hb=5119510b066e7d05bceb19fd24a2287113a6190f;hp=a1152a0d77e27d0ff7839b58fcedbd114218f19f;hpb=21f5c300431f4d667b2d197a69714c63ba37b950;p=mailer.git

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index a1152a0d77..64a99d3f8b 100644
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/09/2008 *
- * ===============                              Last change: 09/09/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/09/2008 *
+ * ===================                          Last change: 09/09/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-modules.php                           *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,38 +50,61 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
 
 	// Rewrite module cache
 	$modArray = $GLOBALS['cache_array']['modules'];
+
+	// Do only process valid arrays
+	if (!isset($modArray['module'])) {
+		// We should fix this!
+		debug_report_bug(__FILE__, __LINE__, 'modArray=<pre>'.print_r($modArray, true).'</pre>');
+	} // END - if
+
+	// Rewrite some parts
 	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]);
+		// Default without sql_patches
+		$entries = array('id','title','locked','hidden','admin_only','mem_only');
+
+		// Is ext-sql_patches newer or equal 0.3.6?
+		if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
+			// Add 'has_menu'
+			$entries[] = 'has_menu';
 		} // END - if
+
+		// Add all
+		foreach ($entries as $entry) {
+			// Is the entry set?
+			if (isset($GLOBALS['cache_array']['modules'][$entry][$key])) {
+				// Transfer it
+				$GLOBALS['cache_array']['modules'][$entry][$mod] = $modArray[$entry][$key];
+
+				// And delete cache
+				unset($GLOBALS['cache_array']['modules'][$entry][$key]);
+			} else {
+				// Log this for debug purposes
+				logDebugMessage(basename(__FILE__), __LINE__, 'Entry not found. module=' . $mod . ',key=' . $key . ',entry=' . $entry);
+			}
+		} // END - foreach
 	} // END - foreach
 	unset($modArray);
-} elseif (getOutputMode() != '1') {
+} elseif (isHtmlOutputMode()) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init('MODULES');
+	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
 	if (isExtensionInstalledAndNewer('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
+	`module` ASC', __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
+	`module` ASC', __FILE__, __LINE__);
 	}
 
 	// Cache all data
@@ -97,9 +119,6 @@ FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `id`', __FILE__, __LINE__);
 	// Close the cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]