Global variables rewritten

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 4b832a07d17ba104162a8394924ce67987fead64..c3d2574d795659a6f0b006496f694a9f6f27fce5 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -43,18 +43,17 @@ $EXT_CSS_FILES = array();
 $ADD = "";
 
 // Init cache instance and array
-global $cacheInstance, $cacheArray;
-$cacheInstance = null;
-$cacheArray = array();
+$GLOBALS['cache_instance'] = null;
+$GLOBALS['cache_array'] = array();
 
 // Skip loading extensions
 if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return;
 
 // Initialize array for "always keep active extensions"
-$cacheArray['active_extensions'] = array();
+$GLOBALS['cache_array']['active_extensions'] = array();
 
 // By default no cache is set
-$cacheMode = "no";
+$GLOBALS['cacheMode'] = "no";
 
 // Load sql_patchrs extension alone
 LOAD_EXTENSION("sql_patches");
@@ -67,37 +66,37 @@ if (EXT_IS_ACTIVE("cache")) {
        LOAD_EXTENSION("cache");
 
        // Check extension cache
-       switch (($cacheInstance->loadCacheFile("extensions", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
-               case true : $cacheMode = "load"; break;
-               case false: $cacheMode = "init"; break;
+       switch (($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
+               case true : $GLOBALS['cacheMode'] = "load"; break;
+               case false: $GLOBALS['cacheMode'] = "init"; break;
        }
 
        // Do we need to init the cache?
-       if (($cacheMode == "init") && (getConfig('cache_exts') == "Y")) {
+       if (($GLOBALS['cacheMode'] == "init") && (getConfig('cache_exts') == "Y")) {
                // Init cache file
-               $cacheInstance->init("EXTENSIONS");
-               $cacheInstance->storeExtensionVersion("sql_patches");
+               $GLOBALS['cache_instance']->init("EXTENSIONS");
+               $GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
        } elseif (getConfig('cache_exts') != "Y") {
                // Cache will not be created for extensions
-               $cacheMode = "skip";
+               $GLOBALS['cacheMode'] = "skip";
        }
 } // END - if
 
 // Load cache?
-if ($cacheMode == "load") {
+if ($GLOBALS['cacheMode'] == "load") {
        // Init include array
        $EXT_POOL = array();
 
        // Re-initialize handler
-       $cacheInstance->loadCacheFile("extensions", true);
+       $GLOBALS['cache_instance']->loadCacheFile("extensions", true);
 
        // Load extension data from cache file
-       $EXT_DUMMY = $cacheInstance->getArrayFromCache();
+       $EXT_DUMMY = $GLOBALS['cache_instance']->getArrayFromCache();
 
        // Is the cache file fine?
        if (!isset($EXT_DUMMY['ext_name'])) {
                // Cache file is damaged so kill it
-               $cacheInstance->destroyCacheFile();
+               $GLOBALS['cache_instance']->destroyCacheFile();
 
                // Retry it
                LOAD_INC(__FILE__);
@@ -139,7 +138,7 @@ if ($cacheMode == "load") {
                $EXT_DUMMY['ext_deprecated'][$name] = "N";
 
                // Mark it as active extension
-               $cacheArray['active_extensions']['$name'] = $EXT_DUMMY['ext_keep'][$k];
+               $GLOBALS['cache_array']['active_extensions']['$name'] = $EXT_DUMMY['ext_keep'][$k];
                unset($EXT_DUMMY['ext_keep'][$k]);
 
                // Remove unneccessary data from memory
@@ -153,7 +152,7 @@ if ($cacheMode == "load") {
        // Loading cache is done so let's free some memory!
        unset($EXT_DUMMY['ext_keep']);
        unset($EXT_DUMMY['ext_css']);
-       $cacheArray['extensions'] = $EXT_DUMMY;
+       $GLOBALS['cache_array']['extensions'] = $EXT_DUMMY;
        unset($EXT_DUMMY);
 
        // No database load needed
@@ -176,7 +175,7 @@ if ($cacheMode == "load") {
        // If current user is not admin load only activated extensions. But load
        // them all if we are going to init the cache files. The admin shall use
        // every available extension for testing purposes.
-       if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
+       if ((!IS_ADMIN()) && ($GLOBALS['cacheMode'] != "init")) $ADD = " WHERE ext_active='Y'";
 
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Query with CSS file from DB
@@ -195,7 +194,7 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1") && ($CSS != "-1")) || ($cacheMode == "no"))) {
+if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cacheMode'] == "no"))) {
        // Load session management
        LOAD_INC_ONCE("inc/session.php");
 
@@ -230,10 +229,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
                        // CSS file handling:
                        if ((!isset($content['ext_css'])) || ($content['ext_css'] == "Y")) {
                                // Create FQFN for the CSS file
-                               $CSS_FILE = sprintf("%stheme/%s/css/%s.css", constant('PATH'), GET_CURR_THEME(), $content['ext_name']);
+                               $GLOBALS['output_mode']_FILE = sprintf("%stheme/%s/css/%s.css", constant('PATH'), GET_CURR_THEME(), $content['ext_name']);
 
                                // Is the file there?
-                               if (FILE_READABLE($CSS_FILE)) {
+                               if (FILE_READABLE($GLOBALS['output_mode']_FILE)) {
                                        // CSS file for extension was found (use only relative path for now!)
                                        $EXT_CSS_FILES[] = $content['ext_name'].".css";
                                        $content['ext_css'] = "Y";
@@ -244,12 +243,12 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
                        } // END - if
 
                        // Shall we cache?
-                       if ($cacheMode == "init") {
+                       if ($GLOBALS['cacheMode'] == "init") {
                                // Add cache row
-                               $cacheInstance->addRow($content);
-                       } elseif ($cacheMode == "no") {
+                               $GLOBALS['cache_instance']->addRow($content);
+                       } elseif ($GLOBALS['cacheMode'] == "no") {
                                // Remember this value for later usage
-                               $cacheArray['active_extensions'][$content['ext_name']] = $EXT_ALWAYS_ACTIVE;
+                               $GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = $EXT_ALWAYS_ACTIVE;
                        }
                } elseif (!FILE_READABLE($FQFN)) {
                        // Deleted extension file so we mark it for removal from DB
@@ -260,9 +259,9 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
        // Init filter system
        INIT_FILTER_SYSTEM();
 
-       if ($cacheMode == "init") {
+       if ($GLOBALS['cacheMode'] == "init") {
                // Close cache file
-               $cacheInstance->finalize();
+               $GLOBALS['cache_instance']->finalize();
 
                // Load more cache files (like admins)
                LOAD_INC_ONCE("inc/load_cache.php");