X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Floader%2Fload_cache-admin.php;h=5c94bb3ca652df33f380f20c18868d1d9b9b3108;hb=0a4b0f81eea5f4daf5e55e695d79a0ee2669bdd8;hp=9bef80aa7af2f5247bc5a93b21f522edb2cf3724;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669;p=mailer.git

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 9bef80aa7a..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 *
@@ -55,16 +54,16 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 		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) {
+			foreach ($GLOBALS['cache_array']['admin']['login'] as $idx => $admin) {
 				// Rewrite all entries
-				foreach ($GLOBALS['cache_array']['admin'] as $key=>$entry) {
+				foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {
 					// Do we have login or regular entries?
-					if ($key == 'login') {
-						// Login, so use id
-						$admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx];
-					} else {
-						// Regular entry so use login
+					if ($key == 'admin_id') {
+						// Admin id, so use login
 						$admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];
+					} else {
+						// Regular entry so use id
+						$admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx];
 					}
 				} // END - foreach
 			} // END - foreach
@@ -82,7 +81,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 		$GLOBALS['cache_instance']->removeCacheFile();
 		unset($GLOBALS['cache_array']['admin']);
 	}
-} elseif (getOutputMode() != '1') {
+} elseif (isHtmlOutputMode()) {
 	// Create cache file
 	$GLOBALS['cache_instance']->init();
 
@@ -115,12 +114,12 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
 	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();
 
 		// 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)) {