Even more variables renamed and login procedure prepared for filter

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index dd8c722038b1ea7c5a1294a041e6114c6d9ba3c3..975ffc393ecb60f04f2d78377cdd6dd76c093505 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -12,7 +12,12 @@
  * -------------------------------------------------------------------- *
  * @TODO Rewrite this whole file to load_cache-extensions.php           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -41,7 +46,7 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 EXT_INIT_CSS_FILES();
-$ADD = "";
+$add = "";
 
 // Init cache instance and array
 $GLOBALS['cache_instance'] = null;
@@ -60,7 +65,7 @@ if ((!isInstalled()) || (isInstalling())) {
 $GLOBALS['cache_array']['active_extensions'] = array();
 
 // By default no cache is set
-$GLOBALS['cacheMode'] = "no";
+$GLOBALS['cache_mode'] = "no";
 
 // Load sql_patchrs extension alone
 if (!LOAD_EXTENSION("sql_patches")) {
@@ -69,7 +74,7 @@ if (!LOAD_EXTENSION("sql_patches")) {
 } // END - if
 
 // Init inc pool array
-$INC_POOL = array();
+INIT_INC_POOL();
 
 //
 // Load extensions
@@ -83,23 +88,23 @@ if (EXT_IS_ACTIVE("cache")) {
 
        // Check extension cache
        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;
+               case true : $GLOBALS['cache_mode'] = "load"; break;
+               case false: $GLOBALS['cache_mode'] = "init"; break;
        }
 
        // Do we need to init the cache?
-       if (($GLOBALS['cacheMode'] == "init") && (getConfig('cache_exts') == "Y")) {
+       if (($GLOBALS['cache_mode'] == "init") && (getConfig('cache_exts') == "Y")) {
                // Init cache file
                $GLOBALS['cache_instance']->init("EXTENSIONS");
                $GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
        } elseif (getConfig('cache_exts') != "Y") {
                // Cache will not be created for extensions
-               $GLOBALS['cacheMode'] = "skip";
+               $GLOBALS['cache_mode'] = "skip";
        }
 } // END - if
 
 // Load cache?
-if ($GLOBALS['cacheMode'] == "load") {
+if ($GLOBALS['cache_mode'] == "load") {
        // Init include array
        $EXT_POOL = array();
 
@@ -191,17 +196,17 @@ if ($GLOBALS['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()) && ($GLOBALS['cacheMode'] != "init")) $ADD = " WHERE ext_active='Y'";
+       if ((!IS_ADMIN()) && ($GLOBALS['cache_mode'] != "init")) $add = " WHERE ext_active='Y'";
 
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Query with CSS file from DB
                $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version
-FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD."
+FROM `{!_MYSQL_PREFIX!}_extensions`".$add."
 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Old obsolete query string
                $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version
-FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD."
+FROM `{!_MYSQL_PREFIX!}_extensions`".$add."
 ORDER BY ext_name", __FILE__, __LINE__);
        }
 }
@@ -210,7 +215,7 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cacheMode'] == "no"))) {
+if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cache_mode'] == "no"))) {
        // Extensions are registered so we load them
        while ($content = SQL_FETCHARRAY($res_ext_crt)) {
                // Get menu entry
@@ -256,10 +261,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
                        } // END - if
 
                        // Shall we cache?
-                       if ($GLOBALS['cacheMode'] == "init") {
+                       if ($GLOBALS['cache_mode'] == "init") {
                                // Add cache row
                                $GLOBALS['cache_instance']->addRow($content);
-                       } elseif ($GLOBALS['cacheMode'] == "no") {
+                       } elseif ($GLOBALS['cache_mode'] == "no") {
                                // Remember this value for later usage
                                $GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = EXT_GET_ALWAYS_ACTIVE();
                        }
@@ -272,7 +277,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
        // Init filter system
        INIT_FILTER_SYSTEM();
 
-       if ($GLOBALS['cacheMode'] == "init") {
+       if ($GLOBALS['cache_mode'] == "init") {
                // Close cache file
                $GLOBALS['cache_instance']->finalize();
 
@@ -288,7 +293,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 }
 
 // Run the filter
-runFilterChain('load_includes', $INC_POOL);
+runFilterChain('load_includes');
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {