More SQL rewrites, TODO: Put all table and column names in backticks (`)

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

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 7e28bda282bd971f1cb55bd5bda7f4a72061ed13..336732ba9aabe3f213eadda4a5da50cb9f5d7efe 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -38,13 +38,13 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Let's start with the admins table...
-if (($cacheInstance->cache_file("admins")) && ($cacheInstance->ext_version_matches("admins"))) {
+if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersionMatches("admins"))) {
        // Load cache
        global $cacheArray;
-       $cacheArray['admins'] = $cacheInstance->cache_load();
+       $cacheArray['admins'] = $cacheInstance->getArrayFromCache();
 
        // Check if valid
-       if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
+       if ((isset($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
                // Check count
                if (count($cacheArray['admins']['login']) == count($cacheArray['admins']['aid'])) {
                        // Get "id map"
@@ -72,18 +72,18 @@ if (($cacheInstance->cache_file("admins")) && ($cacheInstance->ext_version_match
                        } // END - for
                } else {
                        // Nope, cache file is corrupted!
-                       $cacheInstance->cache_destroy();
+                       $cacheInstance->destroyCacheFile();
                        unset($cacheArray['admins']);
                }
        } else {
                // Nope, cache file is corrupted!
-               $cacheInstance->cache_destroy();
+               $cacheInstance->destroyCacheFile();
                unset($cacheArray['admins']);
        }
 } elseif (($_CONFIG['cache_admins'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file
-       $cacheInstance->cache_init("ADMINS");
-       $cacheInstance->store_extension_version("admins");
+       $cacheInstance->init("ADMINS");
+       $cacheInstance->storeExtensionVersion("admins");
 
        // Load every data from DB to cache file
        $ADD = ", id, id";
@@ -97,50 +97,49 @@ FROM "._MYSQL_PREFIX."_admins
 ORDER BY login", __FILE__, __LINE__);
        while($dummy = SQL_FETCHARRAY($result_admins)) {
                // Save row
-               $cacheInstance->add_row($dummy);
+               $cacheInstance->addRow($dummy);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result_admins);
 
        // Close cache
-       $cacheInstance->cache_close();
+       $cacheInstance->finalize();
 
        // Reload the cache
        require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 // Next cached table are the admins_acls...
 if (GET_EXT_VERSION("admins") >= "0.3") {
        // Check for cache file
-       if (($cacheInstance->cache_file("admins_acls")) && ($cacheInstance->ext_version_matches("admins"))) {
+       if (($cacheInstance->loadCacheFile("admins_acls")) && ($cacheInstance->extensionVersionMatches("admins"))) {
                // Load referal system from cache
                global $cacheArray;
-               $cacheArray['admin_acls'] = $cacheInstance->cache_load();
+               $cacheArray['admin_acls'] = $cacheInstance->getArrayFromCache();
        } elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
                // Create cache file here
-               $cacheInstance->cache_init("ADMINS_ACLS");
-               $cacheInstance->store_extension_version("admins");
+               $cacheInstance->init("ADMINS_ACLS");
+               $cacheInstance->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__);
+
+               // Add all rows
                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 cache
+               $cacheInstance->finalize();
+
                // Reload the cache
                require(__FILE__);
        }
-
-       // Close file
-       $cacheInstance->cache_close();
 } // END - if
 
 //