This 'return FALSE' caused that the PHP's error handler was called :( So, do NEVER...

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 12dd105bb298da0153e46a7f2a4cdda4a99bfdf0..77eb4bb074d33739ebbd9d06ebbffb458c45abcc 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,8 +40,28 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Init include file array as it follows same naming scheme
+foreach ( array(
+               'stats',
+               'xml',
+               'callback',
+               'referral',
+               'email',
+               'request',
+               'session',
+               'code',
+               'language',
+               'sql',
+               'expression',
+               'filter',
+               'revision',
+               'extensions') as $lib) {
+       // Load special functions
+       loadIncludeOnce('inc/' . $lib . '-functions.php');
+} // END - foreach
+
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions', 'revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('filters', 'mysql-manager', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -50,7 +70,7 @@ foreach (array('request-functions', 'session-functions', 'code-functions', 'lang
 set_error_handler('__errorHandler');
 
 // Disable block-mode by default
-enableBlockMode(false);
+enableBlockMode(FALSE);
 
 // Init error handler
 initErrorHandler();
@@ -62,8 +82,8 @@ initRequest();
 initMemberId();
 
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) {
-       $GLOBALS['header_sent'] = '0';
+if (!isset($GLOBALS['__header_sent'])) {
+       $GLOBALS['__header_sent'] = '0';
 } // END - if
 
 // Init fatal messages
@@ -89,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 isSqlTableCreated())
-                               setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
-
-                               // Remove MySQL array from namespace
-                               unset($GLOBALS['mysql']);
-
-                               // Load cache
-                               loadIncludeOnce('inc/load_cache.php');
-                       } else {
-                               // Wrong database?
-                               debug_report_bug(__FILE__, __LINE__, 'Wrong database selected.');
-                       }
-               } else {
-                       // No link to database!
-                       debug_report_bug(__FILE__, __LINE__, 'Database link is not yet up.');
-               }
-       } else {
-               // Maybe you forgot to enter your database login?
-               debug_report_bug(__FILE__, __LINE__, 'Database login is missing.');
-       }
+       // Initialize SQL link
+       initSqlLink();
 } else {
        // Default output is 'direct' for HTML output
        setConfigEntry('OUTPUT_MODE', 'direct');
@@ -145,7 +136,10 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 
-       // Check wether we are in installation routine
+       // Init installer
+       initInstaller();
+
+       // Check whether we are in installation routine
        if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
                // Redirect to the URL
                redirectToUrl('install.php');