X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=7ffffb8c6e1f690152b613e7831658889161612c;hp=e6d2822e7d3df623b7ac797d2ef0cb973c1417e1;hb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;hpb=3e64a94e122e30dd66db07fd8c8cfae05871c460 diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php index e6d2822e7d..7ffffb8c6e 100644 --- a/inc/loader/load_cache-admin.php +++ b/inc/loader/load_cache-admin.php @@ -32,140 +32,110 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); -} +} // END - if // Let's start with the admins table... -if (($cacheInstance->cache_file("admins", true) == true)) { +if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) { // Load cache - global $cacheArray; - $cacheArray['admins'] = $cacheInstance->cache_load(); + $GLOBALS['cache_array']['admins'] = $GLOBALS['cache_instance']->getArrayFromCache(); // Check if valid - if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) { + if ((isset($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['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 default_acl - $cacheArray['admins']['aid'][$login] = $cacheArray['admins']['aid'][$k]; - $cacheArray['admins']['password'][$login] = $cacheArray['admins']['password'][$k]; - $cacheArray['admins']['email'][$login] = $cacheArray['admins']['email'][$k]; - - // Some extra data depening on version - if (GET_EXT_VERSION("admins") >= "0.3") { - $cacheArray['admins']['def_acl'][$login] = $cacheArray['admins']['def_acl'][$k]; - if (GET_EXT_VERSION("admins") >= "0.6.7") { - $cacheArray['admins']['la_mode'][$login] = $cacheArray['admins']['la_mode'][$k]; + if (count($GLOBALS['cache_array']['admins']['login']) == count($GLOBALS['cache_array']['admins']['aid'])) { + // Get "id map" + $idMap = $GLOBALS['cache_array']['admins']['aid']; + + // Rewrite the cache array + for ($idx = (count($idMap) - 1); $idx >= 0; $idx--) { + // Rewrite all entries + foreach ($GLOBALS['cache_array']['admins'] as $key=>$entryArray) { + // Rewrite the entry + if ($key == "aid") { + // Rewrite admin id (use login name as index) + $GLOBALS['cache_array']['admins']['aid'][$GLOBALS['cache_array']['admins']['login'][$idx]] = $entryArray[$idx]; + } else { + // Rewrite regular entry + $GLOBALS['cache_array']['admins'][$key][$idMap[$idx]] = $entryArray[$idx]; } - } - - //* DEBUG: */ print_r($cacheArray['admins']); - - // Clear array - if (isset($cacheArray['admins']['aid'][$k])) unset($cacheArray['admins']['aid'][$k]); - if (isset($cacheArray['admins']['def_acl'][$k])) unset($cacheArray['admins']['def_acl'][$k]); - if (isset($cacheArray['admins']['la_mode'][$k])) unset($cacheArray['admins']['la_mode'][$k]); - if (isset($cacheArray['admins']['password'][$k])) unset($cacheArray['admins']['password'][$k]); - if (isset($cacheArray['admins']['email'][$k])) unset($cacheArray['admins']['email'][$k]); - } - - //* 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]); - } - } - - //* DEBUG: */ echo "****\n"; - //* DEBUG: */ print_r($cacheArray['admins']); - //* DEBUG: */ echo ""; - //* DEBUG: */ die(); + + // Is the last entry reached? + if ($idx == 0) { + // Remove it + unset($GLOBALS['cache_array']['admins'][$key][0]); + } // END - if + } // END - if + } // END - for } else { // Nope, cache file is corrupted! - $cacheInstance->cache_destroy(); + $GLOBALS['cache_instance']->destroyCacheFile(); + unset($GLOBALS['cache_array']['admins']); } } else { // Nope, cache file is corrupted! - $cacheInstance->cache_destroy(); - unset($cacheArray['admins']); + $GLOBALS['cache_instance']->destroyCacheFile(); + unset($GLOBALS['cache_array']['admins']); } -} elseif (($_CONFIG['cache_admins'] == "Y") && ($CSS != "1") && ($CSS != "-1")) { +} elseif ((getConfig('cache_admins') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) { // Create cache file - $cacheInstance->cache_init("ADMINS"); + $GLOBALS['cache_instance']->init("ADMINS"); + $GLOBALS['cache_instance']->storeExtensionVersion("admins"); // Load every data from DB to cache file - $ADD = ", id, id"; - if (GET_EXT_VERSION("admins") >= "0.3") $ADD = ", default_acl AS def_acl"; - if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode"; + $ADD = runFilterChain('sql_admin_extra_data'); // Query the database about this $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD." -FROM "._MYSQL_PREFIX."_admins +FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login", __FILE__, __LINE__); while($dummy = SQL_FETCHARRAY($result_admins)) { // Save row - $cacheInstance->add_row($dummy); - } + $GLOBALS['cache_instance']->addRow($dummy); + } // END - while // Free memory SQL_FREERESULT($result_admins); -} -// Close file -$cacheInstance->cache_close(); + // Close cache + $GLOBALS['cache_instance']->finalize(); + + // Include loader again + require(__FILE__); +} // 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) { - // Load referral system from cache - global $cacheArray; - $cacheArray['admin_acls'] = $cacheInstance->cache_load(); - - // Valid cache file - $CNT = 0; - foreach ($cacheArray['admin_acls'] as $k => $array) { - $CNT += count($array); - } - - // When there is a period (.) in the result this test will fail and so the cache file is - // damaged/corrupted - if (count($cacheArray['admin_acls']) > 0) { - $TEST = "failed"; - if (count($cacheArray['admin_acls']) > 0 ) $TEST = ($CNT / (count($cacheArray['admin_acls']))); - if ($TEST != bigintval($TEST)) { - // Cache file is corrupted! - $cacheInstance->cache_destroy(); - unset($cacheArray['admin_acls']); - } - } - } elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) { + if (($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) { + // Load referal system from cache + $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache(); + } elseif ((getConfig('cache_acls') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) { // Create cache file here - $cacheInstance->cache_init("ADMINS_ACLS"); + $GLOBALS['cache_instance']->init("ADMINS_ACLS"); + $GLOBALS['cache_instance']->storeExtensionVersion("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__); - while ($DATA = SQL_FETCHARRAY($result)) { + $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); - } + $GLOBALS['cache_instance']->addRow($data); + } // END - while // Free memory SQL_FREERESULT($result); - } - // Close file - $cacheInstance->cache_close(); -} + // Close cache + $GLOBALS['cache_instance']->finalize(); + + // Include loader again + require(__FILE__); + } +} // END - if // ?>