Cache class rewritten to better convention

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

diff --git a/inc/loader/load_cache-refsystem.php b/inc/loader/load_cache-refsystem.php
index bb903d18f39a28badd8e3decaaddb9bfc013cddb..b841bd1de0b00ba5852b63821fe7db78b21397b4 100644 (file)
--- a/inc/loader/load_cache-refsystem.php
+++ b/inc/loader/load_cache-refsystem.php
@@ -32,44 +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 (refsystem)...
-if ($cacheInstance->cache_file("refsystem", true) == true) {
-       // Load referral system from cache
+// Next cached table is the referal system (refsystem)...
+if (($cacheInstance->loadCacheFile("refsystem")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+       // Load referal system from cache
        global $cacheArray;
-       $cacheArray['ref_system'] = $cacheInstance->cache_load();
-
-       // Valid cache file
-       $CNT = 0;
-       foreach ($cacheArray['ref_system'] as $k => $array) {
-               $CNT += count($array);
-       }
-
-       // We now ignore empty cache here
+       $cacheArray['ref_system'] = $cacheInstance->getArrayFromCache();
 } elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("refsystem");
+       $cacheInstance->init("REFSYSTEM");
+       $cacheInstance->storeExtensionVersion("sql_patches");
 
        // 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)) {
+       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();
-
 //
 ?>