Aliasing should be avoided, better we rename the column or/and use direct column...

[mailer.git] / inc / loader / load_cache-admin.php

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 8a0b92b067be6daa2a6a375f38aff5c8146ed5dc..a0b883bce3306ee472d92172329c091c441c5f69 100644 (file)
--- 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                            *
@@ -18,6 +18,7 @@
  * 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 +56,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 +83,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,7 +116,7 @@ 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();