}
// Let's start with the admins table...
-if (($CACHE->cache_file("admins", true) == true)) {
+if (($cacheInstance->cache_file("admins", true) == true)) {
// Load cache
- global $ADMINS;
- $ADMINS = $CACHE->cache_load();
+ global $cacheArray;
+ $cacheArray['admins'] = $cacheInstance->cache_load();
// Check if valid
- if ((is_array($ADMINS['login'])) && (is_array($ADMINS['aid']))) {
+ if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
// Check count
- if (count($ADMINS['login']) == count($ADMINS['aid'])) {
+ if (count($cacheArray['admins']['login']) == count($cacheArray['admins']['aid'])) {
//* DEBUG: */ echo "<PRE>";
- //* DEBUG: */ print_r($ADMINS);
+ //* DEBUG: */ print_r($cacheArray['admins']);
// The cache file seems to be fine
- foreach ($ADMINS['login'] as $k=>$login) {
+ foreach ($cacheArray['admins']['login'] as $k=>$login) {
// Rewrite default_acl
- $ADMINS['aid'][$login] = $ADMINS['aid'][$k];
- $ADMINS['password'][$login] = $ADMINS['password'][$k];
- $ADMINS['email'][$login] = $ADMINS['email'][$k];
+ $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") {
- $ADMINS['def_acl'][$login] = $ADMINS['def_acl'][$k];
+ $cacheArray['admins']['def_acl'][$login] = $cacheArray['admins']['def_acl'][$k];
if (GET_EXT_VERSION("admins") >= "0.6.7") {
- $ADMINS['la_mode'][$login] = $ADMINS['la_mode'][$k];
+ $cacheArray['admins']['la_mode'][$login] = $cacheArray['admins']['la_mode'][$k];
}
}
- //* DEBUG: */ print_r($ADMINS);
+ //* DEBUG: */ print_r($cacheArray['admins']);
// Clear array
- unset($ADMINS['aid'][$k]);
- unset($ADMINS['def_acl'][$k]);
- unset($ADMINS['la_mode'][$k]);
- unset($ADMINS['password'][$k]);
- unset($ADMINS['email'][$k]);
+ 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($ADMINS);
+ //* DEBUG: */ print_r($cacheArray['admins']);
// Rewrite Login
- foreach ($ADMINS['login'] as $k=>$login) {
- $ADMINS['login'][$ADMINS['aid'][$login]] = $login;
- if (!in_array($k, $ADMINS['aid'])) {
- unset($ADMINS['login'][$k]);
+ 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($ADMINS);
+ //* DEBUG: */ print_r($cacheArray['admins']);
//* DEBUG: */ echo "</PRE>";
//* DEBUG: */ die();
} else {
// Nope, cache file is corrupted!
- $CACHE->cache_destroy();
+ $cacheInstance->cache_destroy();
}
} else {
// Nope, cache file is corrupted!
- $CACHE->cache_destroy();
- unset($ADMINS);
+ $cacheInstance->cache_destroy();
+ unset($cacheArray['admins']);
}
-} elseif (($CONFIG['cache_admins'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_admins'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
// Create cache file
- $CACHE->cache_init("ADMINS");
+ $cacheInstance->cache_init("ADMINS");
// Load every data from DB to cache file
$ADD = ", id, id";
ORDER BY login", __FILE__, __LINE__);
while($dummy = SQL_FETCHARRAY($result_admins)) {
// Save row
- $CACHE->add_row($dummy);
+ $cacheInstance->add_row($dummy);
}
// Free memory
}
// Close file
-$CACHE->cache_close();
+$cacheInstance->cache_close();
// Next cached table is the module registry (mod_reg)...
-if ($CACHE->cache_file("mod_reg", true) == true) {
+if ($cacheInstance->cache_file("mod_reg", true) == true) {
// Load cache
- global $MODULES;
- $MODULES = $CACHE->cache_load();
+ global $cacheArray;
+ $cacheArray['modules'] = $cacheInstance->cache_load();
// Valid cache file
$CNT = 0;
- foreach ($MODULES as $k=>$array) {
+ foreach ($cacheArray['modules'] 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
$TEST = "failed";
- if (count($MODULES) > 0 ) $TEST = ($CNT / (count($MODULES)));
+ if (count($cacheArray['modules']) > 0 ) $TEST = ($CNT / (count($cacheArray['modules'])));
if ($TEST != bigintval($TEST)) {
// Cache file is corrupted!
- $CACHE->cache_destroy();
- unset($MODULES);
+ $cacheInstance->cache_destroy();
+ unset($cacheArray['modules']);
} else {
// Rewrite module cache
- $MOD = $MODULES;
- foreach ($MODULES['module'] as $key=>$mod) {
- $MODULES['id'][$mod] = $MODULES['id'][$key];
- unset($MODULES['id'][$key]);
- $MODULES['title'][$mod] = $MODULES['title'][$key];
- unset($MODULES['title'][$key]);
- $MODULES['locked'][$mod] = $MODULES['locked'][$key];
- unset($MODULES['locked'][$key]);
- $MODULES['hidden'][$mod] = $MODULES['hidden'][$key];
- unset($MODULES['hidden'][$key]);
- $MODULES['admin_only'][$mod] = $MODULES['admin_only'][$key];
- unset($MODULES['admin_only'][$key]);
- $MODULES['mem_only'][$mod] = $MODULES['mem_only'][$key];
- unset($MODULES['mem_only'][$key]);
- $MODULES['has_menu'][$mod] = $MODULES['has_menu'][$key];
- unset($MODULES['has_menu'][$key]);
+ $MOD = $cacheArray['modules'];
+ foreach ($cacheArray['modules']['module'] as $key=>$mod) {
+ $cacheArray['modules']['id'][$mod] = $cacheArray['modules']['id'][$key];
+ unset($cacheArray['modules']['id'][$key]);
+ $cacheArray['modules']['title'][$mod] = $cacheArray['modules']['title'][$key];
+ unset($cacheArray['modules']['title'][$key]);
+ $cacheArray['modules']['locked'][$mod] = $cacheArray['modules']['locked'][$key];
+ unset($cacheArray['modules']['locked'][$key]);
+ $cacheArray['modules']['hidden'][$mod] = $cacheArray['modules']['hidden'][$key];
+ unset($cacheArray['modules']['hidden'][$key]);
+ $cacheArray['modules']['admin_only'][$mod] = $cacheArray['modules']['admin_only'][$key];
+ unset($cacheArray['modules']['admin_only'][$key]);
+ $cacheArray['modules']['mem_only'][$mod] = $cacheArray['modules']['mem_only'][$key];
+ unset($cacheArray['modules']['mem_only'][$key]);
+ $cacheArray['modules']['has_menu'][$mod] = $cacheArray['modules']['has_menu'][$key];
+ unset($cacheArray['modules']['has_menu'][$key]);
}
}
-} elseif (($CONFIG['cache_modreg'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_modreg'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
// Create cache file here
- $CACHE->cache_init("MODULES");
+ $cacheInstance->cache_init("MODULES");
// Load all modules and their data
if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
}
while ($DATA = SQL_FETCHARRAY($result)) {
// Add row to cache file
- $CACHE->add_row($DATA);
+ $cacheInstance->add_row($DATA);
}
// Free memory
}
// Close file
-$CACHE->cache_close();
+$cacheInstance->cache_close();
// Next cached table is the configuration (config)...
-if ($CACHE->cache_file("config", true) == true) {
+if ($cacheInstance->cache_file("config", true) == true) {
// Load config from cache
- global $CFG_CACHE;
- $CFG_CACHE = $CACHE->cache_load();
+ global $cacheArray;
+ $cacheArray = $cacheInstance->cache_load();
// Valid cache file
- $CNT = 0;
- foreach ($CFG_CACHE as $k=>$array) {
+ $CNT = 0; $newCache = array();
+ foreach ($cacheArray as $key=>$array) {
+ foreach ($array as $key2=>$value) {
+ $newCache[$key2][$key] = $value;
+ }
$CNT += count($array);
}
+ // Overwrite the config with the cache version
+ $cacheArray['config'] = $newCache;
+
// When there is a period (.) in the result this test will fail and so the cache file is
// damaged/corrupted
$TEST = "failed";
- if (count($CFG_CACHE) > 0 ) $TEST = ($CNT / (count($CFG_CACHE)));
+ if (count($cacheArray) > 0 ) $TEST = ($CNT / (count($cacheArray)));
if ($TEST != bigintval($TEST)) {
// Cache file is corrupted!
- $CACHE->cache_destroy();
- unset($CFG_CACHE);
+ $cacheInstance->cache_destroy();
+ unset($cacheArray);
}
-} elseif (($CONFIG['cache_config'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_config'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
// Create cache file here
- $CACHE->cache_init("CONFIG");
+ $cacheInstance->cache_init("CONFIG");
// Load all modules and their data
$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config", __FILE__, __LINE__);
while ($DATA = SQL_FETCHARRAY($result)) {
// Add row to cache file
- $CACHE->add_row($DATA);
+ $cacheInstance->add_row($DATA);
}
// Free memory
}
// Close file
-$CACHE->cache_close();
+$cacheInstance->cache_close();
// Next cached table is the referral system (refsystem)...
-if ($CACHE->cache_file("refsystem", true) == true) {
+if ($cacheInstance->cache_file("refsystem", true) == true) {
// Load referral system from cache
global $REF_SYSTEM;
- $REF_SYSTEM = $CACHE->cache_load();
+ $REF_SYSTEM = $cacheInstance->cache_load();
// Valid cache file
$CNT = 0;
if (count($REF_SYSTEM) > 0 ) $TEST = ($CNT / (count($REF_SYSTEM)));
if ($TEST != bigintval($TEST)) {
// Cache file is corrupted!
- $CACHE->cache_destroy();
+ $cacheInstance->cache_destroy();
unset($REF_SYSTEM);
}
-} elseif (($CONFIG['cache_refsys'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_refsys'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
// Create cache file here
- $CACHE->cache_init("REFSYSTEM");
+ $cacheInstance->cache_init("REFSYSTEM");
// Load all modules and their data
$result = SQL_QUERY("SELECT id, userid, level, counter FROM "._MYSQL_PREFIX."_refsystem ORDER BY userid, level", __FILE__, __LINE__);
while ($DATA = SQL_FETCHARRAY($result)) {
// Add row to cache file
- $CACHE->add_row($DATA);
+ $cacheInstance->add_row($DATA);
}
// Free memory
}
// Close file
-$CACHE->cache_close();
+$cacheInstance->cache_close();
// Next cached table is the referral system (refdepths)...
-if ($CACHE->cache_file("refdepths", true) == true) {
+if ($cacheInstance->cache_file("refdepths", true) == true) {
// Load referral system from cache
global $REF_DEPTHS;
- $REF_DEPTHS = $CACHE->cache_load();
+ $REF_DEPTHS = $cacheInstance->cache_load();
// Valid cache file
$CNT = 0;
if (count($REF_DEPTHS) > 0 ) $TEST = ($CNT / (count($REF_DEPTHS)));
if ($TEST != bigintval($TEST)) {
// Cache file is corrupted!
- $CACHE->cache_destroy();
+ $cacheInstance->cache_destroy();
unset($REF_DEPTHS);
}
-} elseif (($CONFIG['cache_refdepth'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_refdepth'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
// Create cache file here
- $CACHE->cache_init("REFDEPTHS");
+ $cacheInstance->cache_init("REFDEPTHS");
// Load all modules and their data
$result = SQL_QUERY("SELECT id, level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
while ($DATA = SQL_FETCHARRAY($result)) {
// Add row to cache file
- $CACHE->add_row($DATA);
+ $cacheInstance->add_row($DATA);
}
// Free memory
}
// Close file
-$CACHE->cache_close();
+$cacheInstance->cache_close();
// Next cached table is the referral system (admins_acls)...
if (GET_EXT_VERSION("admins") >= "0.3") {
// Check for cache file
- if ($CACHE->cache_file("admins_acls", true) == true) {
+ if ($cacheInstance->cache_file("admins_acls", true) == true) {
// Load referral system from cache
- global $ADMINS_ACLS;
- $ADMINS_ACLS = $CACHE->cache_load();
+ global $cacheArray;
+ $cacheArray['admin_acls'] = $cacheInstance->cache_load();
// Valid cache file
$CNT = 0;
- foreach ($ADMINS_ACLS as $k=>$array) {
+ 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($ADMINS_ACLS) > 0) {
+ if (count($cacheArray['admin_acls']) > 0) {
$TEST = "failed";
- if (count($ADMINS_ACLS) > 0 ) $TEST = ($CNT / (count($ADMINS_ACLS)));
+ if (count($cacheArray['admin_acls']) > 0 ) $TEST = ($CNT / (count($cacheArray['admin_acls'])));
if ($TEST != bigintval($TEST)) {
// Cache file is corrupted!
- $CACHE->cache_destroy();
- unset($ADMINS_ACLS);
+ $cacheInstance->cache_destroy();
+ unset($cacheArray['admin_acls']);
}
}
- } elseif (($CONFIG['cache_acls'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+ } elseif (($_CONFIG['cache_acls'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
// Create cache file here
- $CACHE->cache_init("ADMINS_ACLS");
+ $cacheInstance->cache_init("ADMINS_ACLS");
// 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)) {
// Add row to cache file
- $CACHE->add_row($DATA);
+ $cacheInstance->add_row($DATA);
}
// Free memory
}
// Close file
- $CACHE->cache_close();
+ $cacheInstance->cache_close();
}
//