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

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

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index 2a6e181a16272d4748fb631873c078d62797a6b1..0b453f1b4bfa16b697f7e2c42ef028ca48b6a10c 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -35,13 +35,19 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif (!EXT_IS_ACTIVE("theme")) {
+       // Skip this loader
+       return false;
 }
 
-// Next cached table is the referral system (themes)...
-if ($cacheInstance->cache_file("themes", true) == true) {
-       // Load referral system from cache
+// Make cacheInstance global
+global $cacheInstance;
+
+// Next cached table is the referal system (themes)...
+if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersionMatches("theme"))) {
+       // Load referal system from cache
        global $cacheArray;
-       $cache = $cacheInstance->cache_load();
+       $cache = $cacheInstance->getArrayFromCache();
 
        // Restructure the array
        $cacheArray['themes'] = array();
@@ -62,29 +68,31 @@ if ($cacheInstance->cache_file("themes", true) == true) {
 
        // Remove dummy array
        unset($cache);
-} elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_themes') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("themes");
+       $cacheInstance->init("THEMES");
+       $cacheInstance->storeExtensionVersion("theme");
 
        // Load all themes and their data
-       $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM "._MYSQL_PREFIX."_themes ORDER BY id", __FILE__, __LINE__);
+       if (GET_EXT_VERSION("theme") >= "0.0.7") {
+               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
+       } else {
+               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
+       }
        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();
-
 //
 ?>