Renamed all SQL-related functions to camel-case notation

[mailer.git] / inc / loader / load-modules.php

diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php
index a0831eae223c8afb6f42399c5e69aa9896102b0a..f52226607f879c1b5501f2c210c91814409141cb 100644 (file)
--- a/inc/loader/load-modules.php
+++ b/inc/loader/load-modules.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the module registry (mod_reg)...
@@ -53,8 +53,11 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
 
        // Do only process valid arrays
        if (!isset($modArray['module'])) {
-               // We should fix this!
-               debug_report_bug(__FILE__, __LINE__, 'modArray=<pre>'.print_r($modArray, true).'</pre>');
+               // Try to remove the cache file
+               $GLOBALS['cache_instance']->removeCacheFile();
+
+               // We should fix this
+               reportBug(__FILE__, __LINE__, 'modArray=<pre>' . print_r($modArray, TRUE) . '</pre>Please try to reload to fix this.');
        } // END - if
 
        // Rewrite some parts
@@ -65,7 +68,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                // Is ext-sql_patches newer or equal 0.3.6?
                if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
                        // Add 'has_menu'
-                       $entries[] = 'has_menu';
+                       array_push($entries, 'has_menu');
                } // END - if
 
                // Add all
@@ -84,39 +87,55 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                } // END - foreach
        } // END - foreach
        unset($modArray);
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
-       // Load all modules and their data
+       // Is there up-to-date ext-sql_patches?
        if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
-               // Load has_menu
-               $result = SQL_QUERY('SELECT
-       `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`, `has_menu`
+               // Yes, has_menu shall be there
+               $result = sqlQuery('SELECT
+       `id`,
+       `module`,
+       `title`,
+       `locked`,
+       `hidden`,
+       `admin_only`,
+       `title`,
+       `mem_only`,
+       `has_menu`
 FROM
        `{?_MYSQL_PREFIX?}_mod_reg`
 ORDER BY
        `module` ASC', __FILE__, __LINE__);
        } else {
-               // Don't load has_menu
-               $result = SQL_QUERY('SELECT
-       `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`
+               // Not recent enough ext-sql_patches ...
+               $result = sqlQuery('SELECT
+       `id`,
+       `module`,
+       `title`,
+       `locked`,
+       `hidden`,
+       `admin_only`,
+       `title`,
+       `mem_only`
 FROM
        `{?_MYSQL_PREFIX?}_mod_reg`
 ORDER BY
        `module` ASC', __FILE__, __LINE__);
        }
 
-       // Cache all data
-       while ($content = SQL_FETCHARRAY($result)) {
+       // ... and load all entries
+       while ($content = sqlFetchArray($result)) {
                // Add row to cache file
                $GLOBALS['cache_instance']->addRow($content);
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Close the cache
+       $GLOBALS['cache_instance']->storeExtensionVersion('mods');
        $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
        $GLOBALS['cache_instance']->finalize();
 }