X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=5c94bb3ca652df33f380f20c18868d1d9b9b3108;hp=93e862d4c5f60c241ba992574b923241f07acc18;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hpb=06d97fddd5c72e2b1c14ddb855b7eddc53f169a7

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 93e862d4c5..5c94bb3ca6 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.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-config.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 *
@@ -45,50 +44,46 @@ if (!defined('__SECURITY')) {
 if (isInstallationPhase()) return;
 
 // Let's start with the admins table...
-if (($GLOBALS['cache_instance']->loadCacheFile('admins')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
 	// Load cache
-	$GLOBALS['cache_array']['admins'] = $GLOBALS['cache_instance']->getArrayFromCache();
+	$GLOBALS['cache_array']['admin'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Check if valid
-	if ((isset($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['admin_id']))) {
+	if ((isset($GLOBALS['cache_array']['admin']['login'])) && (is_array($GLOBALS['cache_array']['admin']['login'])) && (is_array($GLOBALS['cache_array']['admin']['admin_id']))) {
 		// Check count
-		if (count($GLOBALS['cache_array']['admins']['login']) == count($GLOBALS['cache_array']['admins']['admin_id'])) {
-			// Get "id map"
-			$idMap = $GLOBALS['cache_array']['admins']['admin_id'];
-
-			// Rewrite the cache array
-			for ($idx = (count($idMap) - 1); $idx >= 0; $idx--) {
+		if (count($GLOBALS['cache_array']['admin']['login']) == count($GLOBALS['cache_array']['admin']['admin_id'])) {
+			// Rewrite the cache
+			$admins = array();
+			foreach ($GLOBALS['cache_array']['admin']['login'] as $idx => $admin) {
 				// Rewrite all entries
-				foreach ($GLOBALS['cache_array']['admins'] as $key=>$entryArray) {
-					// Rewrite the entry
+				foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {
+					// Do we have login or regular entries?
 					if ($key == 'admin_id') {
-						// Rewrite admin id (use login name as index)
-						$GLOBALS['cache_array']['admins']['admin_id'][$GLOBALS['cache_array']['admins']['login'][$idx]] = $entryArray[$idx];
+						// Admin id, so use login
+						$admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];
 					} else {
-						// Rewrite regular entry
-						$GLOBALS['cache_array']['admins'][$key][$idMap[$idx]] = $entryArray[$idx];
+						// Regular entry so use id
+						$admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx];
 					}
+				} // END - foreach
+			} // END - foreach
 
-					// Is the last entry reached?
-					if ($idx == 0) {
-						// Remove it
-						unset($GLOBALS['cache_array']['admins'][$key][0]);
-					} // END - if
-				} // END - if
-			} // END - for
+			// Transfer back to cache array and remove dummy
+			$GLOBALS['cache_array']['admin'] = $admins;
+			unset($admins);
 		} else {
 			// Nope, cache file is corrupted!
 			$GLOBALS['cache_instance']->removeCacheFile();
-			unset($GLOBALS['cache_array']['admins']);
+			unset($GLOBALS['cache_array']['admin']);
 		}
 	} else {
 		// Nope, cache file is corrupted!
 		$GLOBALS['cache_instance']->removeCacheFile();
-		unset($GLOBALS['cache_array']['admins']);
+		unset($GLOBALS['cache_array']['admin']);
 	}
-} elseif (getOutputMode() != '1') {
+} elseif (isHtmlOutputMode()) {
 	// Create cache file
-	$GLOBALS['cache_instance']->init('ADMINS');
+	$GLOBALS['cache_instance']->init();
 
 	// Load every data from DB to cache file
 	$add = runFilterChain('sql_admin_extra_data');
@@ -111,23 +106,20 @@ ORDER BY
 	// Close cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('admins');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // Next cached table are the admins_acls...
 if (isExtensionInstalledAndNewer('admins', '0.3')) {
 	// Check for cache file
-	if (($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
+	if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
 		// Load referal system from cache
 		$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
-	} elseif (getOutputMode() != '1') {
+	} elseif (isHtmlOutputMode()) {
 		// Create cache file here
-		$GLOBALS['cache_instance']->init('ADMINS_ACLS');
+		$GLOBALS['cache_instance']->init();
 
 		// Load all modules and their data (column 'id' is no longer required)
-		$result = SQL_QUERY('SELECT `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY admin_id, action_menu, what_menu', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `action_menu` ASC, `what_menu` ASC', __FILE__, __LINE__);
 
 		// Add all rows
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -141,9 +133,6 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
 		// Close cache
 		$GLOBALS['cache_instance']->storeExtensionVersion('admins');
 		$GLOBALS['cache_instance']->finalize();
-
-		// Include loader again
-		loadInclude('inc/loader/'.basename(__FILE__));
 	}
 } // END - if