more in naming convention applied, you should better kill inc/cache/*.cache files...

[mailer.git] / inc / extensions / ext-cache.php

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 99d4cd47a61c188f82d8f1723be43b0a04af083f..ad0f624a9b430eb7e167d306642b201b14557452 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -99,7 +99,7 @@ case "update": // Update an extension
                if (EXT_IS_ACTIVE("cache"))
                {
                        // Check for cache when extension is already installed
-                       if ($CACHE->cache_file("extensions", true)) $CACHE->cache_destroy();
+                       if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
                }
                $UPDATE_NOTES = "Spalte "keep_active" ist hinzugefügt. Cache wurde reinitialisiert.";
                break;
@@ -184,29 +184,29 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
+       $dummy = LOAD_CONFIG();
 
        // Load config and destroy dummy array
-       $_CONFIG['cache_update']   = $DUMMY['cache_update'];   // Last time the cache files are been re-created
-       $_CONFIG['cache_path']     = $DUMMY['cache_path'];     // Relative path for the cache files to 'inc/'
-       $_CONFIG['cache_tested']   = $DUMMY['cache_tested'];   // Says if cache path is tested or not
-       $_CONFIG['db_hits']        = $DUMMY['db_hits'];        // Counted hits on the database (all!)
-       $_CONFIG['cache_hits']     = $DUMMY['cache_hits'];     // Counted hits on the cache arrays in memory
-       $_CONFIG['cache_admins']   = $DUMMY['cache_admins'];   // Is the table '_admins' cacheable?
-       $_CONFIG['cache_acls']     = $DUMMY['cache_acls'];     // Is the table '_admins_acls' cacheable?
-       $_CONFIG['cache_exts']     = $DUMMY['cache_exts'];     // Is the table '_extensions' cacheable?
-       $_CONFIG['cache_config']   = $DUMMY['cache_config'];   // Is the table '_config' cacheable?
-       $_CONFIG['cache_modreg']   = $DUMMY['cache_modreg'];   // Is the table '_mod_reg' cacheable?
-       $_CONFIG['cache_refdepth'] = $DUMMY['cache_refdepth']; // Is the table '_refdepths' cacheable?
-       $_CONFIG['cache_refsys']   = $DUMMY['cache_refsys'];   // Is the table '_refsystem' cacheable?
-       unset($DUMMY);
+       $_CONFIG['cache_update']   = $dummy['cache_update'];   // Last time the cache files are been re-created
+       $_CONFIG['cache_path']     = $dummy['cache_path'];     // Relative path for the cache files to 'inc/'
+       $_CONFIG['cache_tested']   = $dummy['cache_tested'];   // Says if cache path is tested or not
+       $_CONFIG['db_hits']        = $dummy['db_hits'];        // Counted hits on the database (all!)
+       $_CONFIG['cache_hits']     = $dummy['cache_hits'];     // Counted hits on the cache arrays in memory
+       $_CONFIG['cache_admins']   = $dummy['cache_admins'];   // Is the table '_admins' cacheable?
+       $_CONFIG['cache_acls']     = $dummy['cache_acls'];     // Is the table '_admins_acls' cacheable?
+       $_CONFIG['cache_exts']     = $dummy['cache_exts'];     // Is the table '_extensions' cacheable?
+       $_CONFIG['cache_config']   = $dummy['cache_config'];   // Is the table '_config' cacheable?
+       $_CONFIG['cache_modreg']   = $dummy['cache_modreg'];   // Is the table '_mod_reg' cacheable?
+       $_CONFIG['cache_refdepth'] = $dummy['cache_refdepth']; // Is the table '_refdepths' cacheable?
+       $_CONFIG['cache_refsys']   = $dummy['cache_refsys'];   // Is the table '_refsystem' cacheable?
+       unset($dummy);
 
        // Create instance on class
-       if ($CACHE_FILE != "init")
+       if ($cacheMode != "init")
        {
                // Initialize cache system only when it's needed
-               $CACHE = new mxchange_cache($_CONFIG['cache_update'], PATH."inc/".$_CONFIG['cache_path'], $_CONFIG['cache_tested']);
-               if ($CACHE->ret != "done")
+               $cacheInstance = new mxchange_cache($_CONFIG['cache_update'], PATH."inc/".$_CONFIG['cache_path'], $_CONFIG['cache_tested']);
+               if ($cacheInstance->ret != "done")
                {
                        // Failed to initialize cache sustem
                        ADD_FATAL(__FILE__."(".__LINE__."): ".CACHE_CANNOT_INITIALIZE);