X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=8619a8510926b6439da01c74ad2093d1f9fd4cbf;hb=05c5310de0991ba52c441670a315b89ee4f9db12;hp=a733ea9abd2440a6c38aa14c0f974e3fcc7b151d;hpb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a733ea9abd..8619a85109 100644
--- 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                                *
@@ -59,8 +59,11 @@ initErrorHandler();
 // Init request
 initRequest();
 
+// Init userid
+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();
@@ -68,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');
 
@@ -99,9 +102,6 @@ if (!isInstalling()) {
 				// Load cache
 				loadIncludeOnce('inc/load_cache.php');
 
-				// Init filter system
-				initFilterSystem();
-
 				// Run the init filter chain
 				runFilterChain('init');
 
@@ -144,8 +144,8 @@ if (!isInstalling()) {
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
 
-	// Set other missing variables
-	if (!isOutputModeSet()) setOutputMode(0);
+	// 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) {
@@ -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');