Fix for wrong SERVER_NAME usage (may cause trouble)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index df7a3d17513adc11a84cac77023f2be3aab56025..77eb4bb074d33739ebbd9d06ebbffb458c45abcc 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -109,37 +109,8 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // CSS array
        initExtensionCssFiles();
 
-       if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['dbase']))) {
-               // Connect to DB
-               SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);
-
-               // Is the link valid?
-               if (SQL_IS_LINK_UP()) {
-                       // Enable exit on error
-                       enableExitOnError();
-
-                       // Is it a valid resource?
-                       if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
-                               // Set database name (required for ext-optimize and ifSqlTableExists())
-                               setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
-
-                               // Remove MySQL array from namespace
-                               unset($GLOBALS['mysql']);
-
-                               // Load cache
-                               loadIncludeOnce('inc/load_cache.php');
-                       } else {
-                               // Wrong database?
-                               reportBug(__FILE__, __LINE__, 'Wrong database selected.');
-                       }
-               } else {
-                       // No link to database!
-                       reportBug(__FILE__, __LINE__, 'Database link is not yet up.');
-               }
-       } else {
-               // Maybe you forgot to enter your database login?
-               reportBug(__FILE__, __LINE__, 'Database login is missing.');
-       }
+       // Initialize SQL link
+       initSqlLink();
 } else {
        // Default output is 'direct' for HTML output
        setConfigEntry('OUTPUT_MODE', 'direct');