More HTML improvements

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 61353a29839085000f57eb50b25079fd603eb42b..8619a8510926b6439da01c74ad2093d1f9fd4cbf 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/16/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/16/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mysql-connect.php                                *
@@ -63,7 +63,7 @@ initRequest();
 initMemberId();
 
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 
 // Init fatal messages
 initFatalMessages();
@@ -71,8 +71,8 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
@@ -102,9 +102,6 @@ if (!isInstalling()) {
                                // Load cache
                                loadIncludeOnce('inc/load_cache.php');
 
-                               // Init filter system
-                               initFilterSystem();
-
                                // Run the init filter chain
                                runFilterChain('init');
 
@@ -147,6 +144,9 @@ if (!isInstalling()) {
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
+       // CFG: DATABASE-TYPE
+       setConfigEntry('_DB_TYPE', 'mysql3');
+
        // Include more
        foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
                // Load the include
@@ -156,15 +156,15 @@ if (!isInstalling()) {
        // Load config
        loadIncludeOnce('inc/load_config.php');
 
+       // Init filter system here
+       initFilterSystem();
+
        // Are we installation routine?
        if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if
 
-       // Init filter system here
-       initFilterSystem();
-
        // Load cache
        loadIncludeOnce('inc/load_cache.php');