X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=6cbf5c00180a0b81846b4fa7113fa04bc2d35551;hp=65cfb6214db6267a83c736c92ef4d2bacb6802d4;hb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;hpb=508228c85fba8448d00865b1639cb8cd7a69e457 diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php index 65cfb6214d..6cbf5c0018 100644 --- a/inc/loader/load_cache-admin.php +++ b/inc/loader/load_cache-admin.php @@ -10,14 +10,14 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Mehr Cache-Dateien nachladen * * -------------------------------------------------------------------- * - * $Revision:: 856 $ * + * $Revision:: $ * * $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 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -38,64 +38,64 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; - require($INC); + 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']['aid']))) { + 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']['aid'])) { - // Get "id map" - $idMap = $GLOBALS['cache_array']['admins']['aid']; - - // 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 == "aid") { - // Rewrite admin id (use login name as index) - $GLOBALS['cache_array']['admins']['aid'][$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']->destroyCacheFile(); - unset($GLOBALS['cache_array']['admins']); + $GLOBALS['cache_instance']->removeCacheFile(); + unset($GLOBALS['cache_array']['admin']); } } else { // Nope, cache file is corrupted! - $GLOBALS['cache_instance']->destroyCacheFile(); - unset($GLOBALS['cache_array']['admins']); + $GLOBALS['cache_instance']->removeCacheFile(); + unset($GLOBALS['cache_array']['admin']); } -} elseif ((getConfig('cache_admins') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) { +} elseif (getOutputMode() != 1) { // Create cache file - $GLOBALS['cache_instance']->init("ADMINS"); - $GLOBALS['cache_instance']->storeExtensionVersion("admins"); + $GLOBALS['cache_instance']->init(); // Load every data from DB to cache file - $ADD = runFilterChain('sql_admin_extra_data'); + $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` -ORDER BY login", __FILE__, __LINE__); + $result_admins = SQL_QUERY('SELECT + `id` AS admin_id, `login`, `password`, `email`' . $add . ' +FROM + `{?_MYSQL_PREFIX?}_admins` +ORDER BY + `login` ASC', __FILE__, __LINE__); while ($dummy = SQL_FETCHARRAY($result_admins)) { // Save row $GLOBALS['cache_instance']->addRow($dummy); @@ -105,42 +105,37 @@ ORDER BY login", __FILE__, __LINE__); SQL_FREERESULT($result_admins); // Close cache + $GLOBALS['cache_instance']->storeExtensionVersion('admins'); $GLOBALS['cache_instance']->finalize(); - - // Include loader again - require(__FILE__); } // Next cached table are the admins_acls... -if (GET_EXT_VERSION("admins") >= "0.3") { +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 ((getConfig('cache_acls') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) { + } elseif (getOutputMode() != 1) { // Create cache file here - $GLOBALS['cache_instance']->init("ADMINS_ACLS"); - $GLOBALS['cache_instance']->storeExtensionVersion("admins"); + $GLOBALS['cache_instance']->init(); - // 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__); + // 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` ASC, `action_menu` ASC, `what_menu` ASC', __FILE__, __LINE__); // Add all rows - while ($data = SQL_FETCHARRAY($result)) { + while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file - $GLOBALS['cache_instance']->addRow($data); + $GLOBALS['cache_instance']->addRow($content); } // END - while // Free memory SQL_FREERESULT($result); // Close cache + $GLOBALS['cache_instance']->storeExtensionVersion('admins'); $GLOBALS['cache_instance']->finalize(); - - // Include loader again - require(__FILE__); } } // END - if -// +// [EOF] ?>