Cache class rewritten to better convention

[mailer.git] / inc / loader / load_cache-refdepths.php

diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php
index 28da4a7d4a13a50b9517585650a2cde1e61116a1..41097f3bc5e39ffea261a0eee92b69cbd87832a2 100644 (file)
--- a/inc/loader/load_cache-refdepths.php
+++ b/inc/loader/load_cache-refdepths.php
@@ -32,52 +32,37 @@
  ************************************************************************/
 
 // 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);
 }
 
-// Next cached table is the referral system (refdepths)...
-if ($cacheInstance->cache_file("refdepths", true) == true) {
-       // Load referral system from cache
+// Next cached table is the referal system (refdepths)...
+if (($cacheInstance->loadCacheFile("refdepths")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+       // Load referal system from cache
        global $cacheArray;
-       $cacheArray['ref_depths'] = $cacheInstance->cache_load();
-
-       // Valid cache file
-       $CNT = 0;
-       foreach ($cacheArray['ref_depths'] 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($cacheArray['ref_depths']) > 0 ) $TEST = ($CNT / (count($cacheArray['ref_depths'])));
-       if ($TEST != bigintval($TEST)) {
-               // Cache file is corrupted!
-               $cacheInstance->cache_destroy();
-               unset($cacheArray['ref_depths']);
-       }
+       $cacheArray['ref_depths'] = $cacheInstance->getArrayFromCache();
 } elseif (($_CONFIG['cache_refdepth'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("REFDEPTHS");
+       $cacheInstance->init("REFDEPTHS");
+       $cacheInstance->storeExtensionVersion("sql_patches");
 
        // 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)) {
+       while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
-               $cacheInstance->add_row($DATA);
-       }
+               $cacheInstance->addRow($data);
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
+       // Close the cache
+       $cacheInstance->finalize();
+
        // Reload the cache
        require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>