Fixes for broken order page and themes

[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 cc4ae544b48862f85c7b67f7b46b7a8de95bb780..8a0b92b067be6daa2a6a375f38aff5c8146ed5dc 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -41,51 +41,50 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Use this code if you don't want to run this cache loader on installation phase
+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
-                                       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];
+                               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 {
-                                               // Rewrite regular entry
-                                               $GLOBALS['cache_array']['admins'][$key][$idMap[$idx]] = $entryArray[$idx];
+                                               // Regular entry so use login
+                                               $admins[$key][$GLOBALS['cache_array']['admin']['login'][$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') {
        // 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');
@@ -108,23 +107,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') {
                // 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)) {
@@ -138,9 +134,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