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

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 8c469bd3c08066a3637d8a16eb5b76d5c8cc351d..0f35a1acfd6b45a39c34da302f09785d42d68338 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -51,12 +51,12 @@ if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."
        // Load it...
        $EXT_LOAD_MODE = "";
        require_once(PATH."inc/extensions/ext-sql_patches.php");
-       $KEEP_ACTIVE = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
+       $cacheArray['active_extensions'] = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
 }
  else
 {
        // Initialize array for "always keep active extensions"
-       $KEEP_ACTIVE = array();
+       $cacheArray['active_extensions'] = array();
 }
 
 //
@@ -66,35 +66,35 @@ if (EXT_IS_ACTIVE("cache"))
 {
        // Load cache extension alone
        include_once(PATH."inc/libs/cache_functions.php");
-       $CACHE_FILE = "";
+       $cacheMode = "";
        include_once(PATH."inc/extensions/ext-cache.php");
-       switch($CACHE->cache_file("extensions", true))
+       switch($cacheInstance->cache_file("extensions", true))
        {
-               case true : $CACHE_FILE = "load"; break;
-               case false: $CACHE_FILE = "init"; break;
+               case true : $cacheMode = "load"; break;
+               case false: $cacheMode = "init"; break;
        }
 
        // Do not recreate cache file when it's switched off!
-       if (($CACHE_FILE == "init") && ($_CONFIG['cache_exts'] == 'N')) $CACHE_FILE = "skip";
+       if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == 'N')) $cacheMode = "skip";
 
        // Load language
-       if ($CACHE_FILE == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
+       if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
 }
  else
 {
-       $CACHE_FILE = "no";
+       $cacheMode = "no";
 }
 
-if ($CACHE_FILE == "load")
+if ($cacheMode == "load")
 {
        // Load more cache files (like admins)
        require_once(PATH."inc/load_cache.php");
 
        // Re-initialize handler
-       $CACHE->cache_file("extensions", true);
+       $cacheInstance->cache_file("extensions", true);
 
        // Load extension data from cache file
-       $EXT_DUMMY = $CACHE->cache_load();
+       $EXT_DUMMY = $cacheInstance->cache_load();
        foreach ($EXT_DUMMY['ext_name'] as $k=>$name)
        {
                // Load functions file
@@ -123,7 +123,7 @@ if ($CACHE_FILE == "load")
                unset($EXT_DUMMY['ext_active'][$k]);
                $EXT_DUMMY['ext_menu'][$name] = $EXT_DUMMY['ext_menu'][$k];
                unset($EXT_DUMMY['ext_menu'][$k]);
-               $KEEP_ACTIVE['$name'] = $EXT_DUMMY['ext_keep'][$k];
+               $cacheArray['active_extensions']['$name'] = $EXT_DUMMY['ext_keep'][$k];
                unset($EXT_DUMMY['ext_keep'][$k]);
                $k2 = $EXT_DUMMY['ext_id'][$k];
                $EXT_DUMMY['ext_id'][$k2] = $name;
@@ -136,14 +136,14 @@ if ($CACHE_FILE == "load")
        }
 
        // Close cache file
-       $CACHE->cache_close();
+       $cacheInstance->cache_close();
 
        // Loading cache is done so let's free some memory!
        unset($EXT_DUMMY['ext_lang']);
        unset($EXT_DUMMY['ext_keep']);
        unset($EXT_DUMMY['ext_css']);
        unset($EXT_DUMMY['ext_funcs']);
-       $EXTENSIONS = $EXT_DUMMY;
+       $cacheArray['extensions'] = $EXT_DUMMY;
        unset($EXT_DUMMY);
 
        // No database load needed
@@ -175,13 +175,13 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE == "no")) && ($CSS != "1") && ($CSS != "-1"))
+if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode == "no")) && ($CSS != "1") && ($CSS != "-1"))
 {
        // Load theme management
        require_once(PATH."inc/theme-manager.php");
 
        // If we need to init the cache init it now
-       if ($CACHE_FILE == "init") $CACHE->cache_init("EXTENSIONS");
+       if ($cacheMode == "init") $cacheInstance->cache_init("EXTENSIONS");
 
        // Extensions are registered so we load them
        while (list($EXT_ID, $name, $lang, $css, $active, $version) = SQL_FETCHROW($res_ext_crt))
@@ -264,9 +264,9 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
                        }
 
                        // Add cache row
-                       if ($CACHE_FILE == "init")
+                       if ($cacheMode == "init")
                        {
-                               $CACHE->add_row(array(
+                               $cacheInstance->add_row(array(
                                        'ext_id'      => $EXT_ID,
                                        'ext_name'    => $name,
                                        'ext_lang'    => $lang,
@@ -278,10 +278,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
                                        'ext_keep'    => $EXT_ALWAYS_ACTIVE,
                                ));
                        }
-                        elseif ($CACHE_FILE == "no")
+                        elseif ($cacheMode == "no")
                        {
                                // Remember this value for later usage
-                               $KEEP_ACTIVE[$name] = $EXT_ALWAYS_ACTIVE;
+                               $cacheArray['active_extensions'][$name] = $EXT_ALWAYS_ACTIVE;
                        }
                }
                 elseif (!file_exists($file1))
@@ -291,10 +291,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
                }
        }
 
-       if ($CACHE_FILE == "init")
+       if ($cacheMode == "init")
        {
                // Close cache file
-               $CACHE->cache_close();
+               $cacheInstance->cache_close();
 
                // Load more cache files (like admins)
                require_once(PATH."inc/load_cache.php");
@@ -304,16 +304,6 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 // Free memory
 SQL_FREERESULT($res_ext_crt);
 
-// Compile configuration system
-/**
- * Commented out...
- *
- *foreach ($_CONFIG as $k=>$v)
- *{
- *     $_CONFIG[$k] = COMPILE_CODE($v);
- *}
- */
-
 // Load include files
 if (!empty($INC_POOL[0]))
 {