A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index dff3faf065ea10ab34d3cec70f0face778c14692..f056fafa59eac5213661710e91e0698080059ce2 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -10,6 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle Erweiterungen laden                         *
  * -------------------------------------------------------------------- *
+ * @TODO Rewrite this whole file to load_cache-extensions.php           *
+ * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
@@ -58,7 +60,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")) {
@@ -81,23 +83,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();
 
@@ -113,7 +115,7 @@ if ($GLOBALS['cacheMode'] == "load") {
                $GLOBALS['cache_instance']->destroyCacheFile();
 
                // Retry it
-               LOAD_INC(__FILE__);
+               require(__FILE__);
                return;
        } // END -  if
 
@@ -189,7 +191,7 @@ 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
@@ -208,7 +210,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
@@ -254,10 +256,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();
                        }
@@ -270,7 +272,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();