X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Floader%2Fload_cache-admin.php;h=e29f3e2bfdd7bd59ae49fef34e1249dd8c9359d6;hb=249af9b67343a73df780d95982ccc32d81e564ab;hp=2de94871bceb7ac3a2c929708d53fb2ee867f209;hpb=2305bb069ede07db6227ab5e51960e501e75d7e6;p=mailer.git diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php index 2de94871bc..e29f3e2bfd 100644 --- a/inc/loader/load_cache-admin.php +++ b/inc/loader/load_cache-admin.php @@ -38,70 +38,42 @@ if (!defined('__SECURITY')) { } // END - if // Let's start with the admins table... -if (($cacheInstance->cache_file("admins", true) == true) && ($cacheInstance->ext_version_matches("admins"))) { +if (($cacheInstance->cache_file("admins")) && ($cacheInstance->ext_version_matches("admins"))) { // Load cache global $cacheArray; $cacheArray['admins'] = $cacheInstance->cache_load(); // Check if valid - if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) { + if ((isset($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) { // Check count if (count($cacheArray['admins']['login']) == count($cacheArray['admins']['aid'])) { - //* DEBUG: */ echo "
"; - //* DEBUG: */ print_r($cacheArray['admins']); - - // The cache file seems to be fine - foreach ($cacheArray['admins']['login'] as $k => $login) { - // Rewrite admin id - $cacheArray['admins']['aid'][$login] = $cacheArray['admins']['aid'][$k]; - - // Shortcut admin id - $aid = $cacheArray['admins']['aid'][$login]; - - // Rewrite others... - $cacheArray['admins']['password'][$aid] = $cacheArray['admins']['password'][$k]; - $cacheArray['admins']['email'][$aid] = $cacheArray['admins']['email'][$k]; - - // Some extra data depending on version - if (GET_EXT_VERSION("admins") >= "0.3") { - // Default ACL - $cacheArray['admins']['def_acl'][$aid] = $cacheArray['admins']['def_acl'][$k]; - if (GET_EXT_VERSION("admins") >= "0.6.7") { - // "Logical Area" mode - $cacheArray['admins']['la_mode'][$aid] = $cacheArray['admins']['la_mode'][$k]; - if (GET_EXT_VERSION("admins") >= "0.7.0") { - // Login failtures - $cacheArray['admins']['login_failtures'][$aid] = $cacheArray['admins']['login_failtures'][$k]; - $cacheArray['admins']['last_failture'][$aid] = $cacheArray['admins']['last_failture'][$k]; - } // END - if + // Get "id map" + $idMap = $cacheArray['admins']['aid']; + + // Rewrite the cache array + for ($idx = (count($idMap) - 1); $idx >= 0; $idx--) { + // Rewrite all entries + foreach ($cacheArray['admins'] as $key=>$entryArray) { + // Rewrite the entry + if ($key == "aid") { + // Rewrite admin id (use login name as index) + $cacheArray['admins']['aid'][$cacheArray['admins']['login'][$idx]] = $entryArray[$idx]; + } else { + // Rewrite regular entry + $cacheArray['admins'][$key][$idMap[$idx]] = $entryArray[$idx]; + } + + // Is the last entry reached? + if ($idx == 0) { + // Remove it + unset($cacheArray['admins'][$key][0]); } // END - if } // END - if - - //* DEBUG: */ print_r($cacheArray['admins']); - - // Clear array - foreach (array('aid', 'def_acl', 'la_mode', 'password', 'email', 'login_failtures', 'last_failture') as $rem) { - if (isset($cacheArray['admins'][$rem][$k])) unset($cacheArray['admins'][$rem][$k]); - } // END - foreach - } // END - if - - //* DEBUG: */ print_r($cacheArray['admins']); - - // Rewrite Login - foreach ($cacheArray['admins']['login'] as $k => $login) { - $cacheArray['admins']['login'][$cacheArray['admins']['aid'][$login]] = $login; - if (!in_array($k, $cacheArray['admins']['aid'])) { - unset($cacheArray['admins']['login'][$k]); - } // END - if - } // END - foreach - - //* DEBUG: */ echo "****\n"; - //* DEBUG: */ print_r($cacheArray['admins']); - //* DEBUG: */ echo ""; - //* DEBUG: */ die(); + } // END - for } else { // Nope, cache file is corrupted! $cacheInstance->cache_destroy(); + unset($cacheArray['admins']); } } else { // Nope, cache file is corrupted! @@ -144,16 +116,19 @@ $cacheInstance->cache_close(); // Next cached table are the admins_acls... if (GET_EXT_VERSION("admins") >= "0.3") { // Check for cache file - if ($cacheInstance->cache_file("admins_acls", true) == true) { + if (($cacheInstance->cache_file("admins_acls")) && ($cacheInstance->ext_version_matches("admins"))) { // Load referal system from cache global $cacheArray; $cacheArray['admin_acls'] = $cacheInstance->cache_load(); } elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) { // Create cache file here $cacheInstance->cache_init("ADMINS_ACLS"); + $cacheInstance->store_extension_version("admins"); // Load all modules and their data $result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__); + + // Add all rows while ($data = SQL_FETCHARRAY($result)) { // Add row to cache file $cacheInstance->add_row($data); @@ -162,6 +137,9 @@ if (GET_EXT_VERSION("admins") >= "0.3") { // Free memory SQL_FREERESULT($result); + // Close cache + $cacheInstance->cache_close(); + // Reload the cache require(__FILE__); }