All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

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

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 126888ba9bfe80cee68e7fb33c46b0127b6fcedb..7e6411ae5b1c20293b97ffe13d73bb0502b883f0 100644 (file)
--- a/inc/loader/load_cache-modreg.php
+++ b/inc/loader/load_cache-modreg.php
@@ -37,11 +37,14 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Next cached table is the module registry (mod_reg)...
-if (($cacheInstance->cache_file("mod_reg")) && ($cacheInstance->ext_version_matches("sql_patches"))) {
+if (($cacheInstance->loadCacheFile("mod_reg")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load cache
        global $cacheArray;
-       $cacheArray['modules'] = $cacheInstance->cache_load();
+       $cacheArray['modules'] = $cacheInstance->getArrayFromCache();
 
        // Rewrite module cache
        $modArray = $cacheArray['modules'];
@@ -64,40 +67,37 @@ if (($cacheInstance->cache_file("mod_reg")) && ($cacheInstance->ext_version_matc
                } // END - if
        } // END - foreach
        unset($modArray);
-} elseif (($_CONFIG['cache_modreg'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_modreg') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("MODULES");
-       $cacheInstance->store_extension_version("sql_patches");
+       $cacheInstance->init("MODULES");
+       $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data
        if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                // Load has_menu
                $result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
-FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);
        } else {
                // Don't load has_menu
                $result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only
-FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);
        }
 
        // Cache all data
        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->cache_close();
+       $cacheInstance->finalize();
 
        // Reload the cache
-       require(__FILE__);
+       LOAD_INC(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>