Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index ac83a0f81397493d422e4fe9513a096877f58fe6..7187e54e30a67381ab605b15e93d1c88da9e9995 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -12,13 +12,8 @@
  * -------------------------------------------------------------------- *
  * @TODO Rewrite this whole file                                        *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,9 +35,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+} elseif (isInstaller()) {
+       // Do not run in installation phase
+       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
+       return FALSE;
 }
 
 // Next cached table is the extension
@@ -53,21 +49,21 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        // Init extension inc-pool
        $EXT_POOL = array();
 
-       // Do we have entries?
+       // Are there entries?
        if (count($EXT_DUMMY) > 0) {
                // Init arrays
                $EXT_NAMES = array();
 
                // Loop through all
                foreach ($EXT_DUMMY['ext_name'] as $k => $ext_name) {
-                       // Load CSS file
+                       // Load CSS file?
                        if ($EXT_DUMMY['ext_css'][$k] == 'Y') {
                                addExtensionCssFile($ext_name . '.css');
                        } // END - if
 
                        // Load extension file itself
                        if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y')) {
-                               $EXT_POOL[] = $ext_name;
+                               array_push($EXT_POOL, $ext_name);
                        } // END - if
 
                        // Version number
@@ -123,7 +119,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        unset($EXT_DUMMY);
 
        // No database load needed
-       $res_ext_crt = false;
+       $res_ext_crt = FALSE;
 
        // Load all extension files in test-mode (we initialize them later)
        foreach ($EXT_POOL as $ext) {
@@ -132,31 +128,41 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
        // Remove array and mark cache as loaded
        unset($EXT_POOL);
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
-       // Add more if sql_patches is recent enougth
+       // Add more if ext-sql_patches is recent enougth
        $add = '';
        if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
-               $add = ',`ext_has_css` AS `ext_css`';
+               // Old naming
+               $add = ', `ext_has_css` AS `ext_css`';
        } // END - if
 
        // Query for all extensions
-       $result = SQL_QUERY('SELECT `id` AS `ext_id`,`ext_name`,`ext_active`,`ext_version`' . $add . ' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__);
+       $result = sqlQuery('SELECT
+       `id` AS `ext_id`,
+       `ext_name`,
+       `ext_active`,
+       `ext_version`
+' . $add . '
+FROM
+       `{?_MYSQL_PREFIX?}_extensions`
+ORDER BY
+       `ext_name` ASC', __FILE__, __LINE__);
 
        // Load all entries
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Load extension
                if (!loadExtension($content['ext_name'], 'test')) {
                        // Is the name valid?
                        if (!isExtensionNameValid($content['ext_name'])) {
                                // Is not valid name (empty ext-foo.php script)
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+                               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
                                        array($content['ext_name']), __FILE__, __LINE__);
                        } else {
                                // Didn't load so deactivate it
-                               doDeactivateExtension($content['ext_name'], true);
+                               doDeactivateExtension($content['ext_name'], TRUE);
                        }
 
                        // ... and skip it
@@ -164,7 +170,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
                } // END - if
 
                // Get menu entry
-               $content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], true));
+               $content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], TRUE));
 
                // Get language entry
                $content['ext_lang'] = convertBooleanToYesNo(isLanguageIncludeReadable($content['ext_name']));
@@ -185,7 +191,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Close the cache
        $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');