Debug code commented out

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 15a5e4f7919ff90f690bd7ba9c1783625d7a989f..14ff7074fe7f46be755e3a2f3f76cdada506f75e 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,8 +43,8 @@ define('DEBUG_SQL', false);
 // Non-database functions
 require("inc/functions.php");
 
-// Load more function libraries
-foreach (array('request-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+// Load more function libraries or includes
+foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks', 'session') as $lib) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -66,7 +66,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_I
                // Please run the installation script (maybe again)
                mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
        }
-} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!
        OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
@@ -85,7 +85,7 @@ $GLOBALS['header_sent'] = 0;
 initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory
        if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
 
@@ -115,9 +115,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Loading patching system is required here...
                                LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
 
-                               // Session management
-                               LOAD_INC_ONCE("inc/session.php");
-
                                // Run daily reset
                                LOAD_INC_ONCE("inc/check-reset.php");
 
@@ -212,9 +209,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
-       // Include required files
+       // Include databases.php
        LOAD_INC_ONCE("inc/databases.php");
-       LOAD_INC_ONCE("inc/session.php");
 
        // Check if we are in installation routine
        if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {