X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a4e1a8b739d27abd654419b29cc30cdb932b509f;hb=606e585919ff565b55fb3c2cdee4a80c4e61a9c6;hp=6e257ae8042df648001cd7537f94dedb6b0c2880;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6e257ae804..a4e1a8b739 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                                *
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,15 +38,11 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
-
-// Non-database functions
-require('inc/functions.php');
+	die();
+} // END - if
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -54,127 +50,76 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
-	// No login entered and outside installation mode
-	OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
-	if (isInstalled()) {
-		// You have changed my configuration file!
-		app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
-	} else {
-		// Please run the installation script (maybe again)
-		app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
-	}
-} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
-	// No database password entered!!!
-	OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
-}
+// Disable block-mode by default
+enableBlockMode(false);
+
+// Init error handler
+initErrorHandler();
+
+// Init request
+initRequest();
 
-// Set dummy config array
-initConfig();
+// Init userid
+initMemberId();
 
 // Set important header_sent
-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 
 // Init fatal messages
 initFatalMessages();
 
+// Init message system
+initMessages();
+
 // Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (isInstalled())) {
-	// Check for write-permission for config.php and inc directory
-	if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
-	if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'index';
+if (!isInstalling()) {
+	// Load configuration file(s) here
+	loadIncludeOnce('inc/load_config.php');
+
+	// Load database layer here
+	loadIncludeOnce('inc/db/lib.php');
 
 	// CSS array
-	EXT_INIT_CSS_FILES();
+	initExtensionCssFiles();
 
-	if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
+	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
 		// Connect to DB
-		SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
+		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($MySQL['dbase'], __FILE__, __LINE__) === true) {
+			if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
 				// This is required for extension 'optimize' to work
-				define('__DB_NAME', $MySQL['dbase']);
+				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
 				// Remove MySQL array from namespace
-				unset($MySQL);
-
-				// Load configuration stuff
-				loadConfiguration();
-
-				// Load "databases" aka static arrays
-				loadIncludeOnce('inc/databases.php');
-
-				// Init session
-				loadIncludeOnce('inc/session.php');
-
-				// Load versions
-				loadIncludeOnce('inc/versions.php');
-
-				// Loading patching system is required here...
-				loadIncludeOnce('inc/patch-system.php'); // Initialize patch system
-
-				// Run daily reset
-				loadIncludeOnce('inc/check-reset.php');
-
-				// Load admin include file if he is admin
-				if (IS_ADMIN()) {
-					// Administrative functions
-					loadIncludeOnce('inc/modules/admin/admin-inc.php');
-				} // END - if
-				//* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000);
-				//* DEBUG: */ die();
-
-				// Get all values
-				if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
-					if (empty($GLOBALS['module']))  $GLOBALS['module'] = 'empty';
-					if (empty($GLOBALS['what']))    $GLOBALS['what']   = getWhatFromModule($GLOBALS['module']);
-					if (empty($GLOBALS['action']))  $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
-				} else {
-					// Set action/what to empty
-					$GLOBALS['action'] = '';
-					$GLOBALS['what']   = '';
-				}
+				unset($GLOBALS['mysql']);
+
+				// Load cache
+				loadIncludeOnce('inc/load_cache.php');
+
+				// Init filter system
+				initFilterSystem();
 
 				// Run the init filter chain
 				runFilterChain('init');
 
-				// Set default 'what' value
-				//* DEBUG: */ OUTPUT_HTML('-'.$GLOBALS['module'].'/'.$GLOBALS['what']."-<br />");
-				if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
-					if ($GLOBALS['module'] == 'admin') {
-						// Set 'action' value to 'login' in admin menu
-						$GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
-					} elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
-						// Set 'what' value to 'welcome' in guest and member menu
-						$GLOBALS['what'] = 'welcome';
-						if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
-					} else {
-						// Anything else like begging link
-						$GLOBALS['what'] = '';
-					}
-				} // END - if
-
-				// Update sending pool
-				if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
-
-				// Load all active extension including language files when not upgrading.
-				// Check module for testing and count one click
-				if (checkModulePermissions($GLOBALS['module']) == 'done') countModuleHit($GLOBALS['module']);
-
-				// Shall we activate the exchange?
-				if (getConfig('activate_xchange') > 0) activateExchange();
-
-				// Is the extension sql_patches installed and at least 0.3.6?
-				if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
-					// Generate random number
-					define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ''));
-				} else {
-					// Generate weak (!!!) code
-					define('RAND_NUMBER', mt_rand(1000000, 9999999));
+				// Check module for permissions
+				$checkModule = checkModulePermissions();
+
+				// Admin module should be accessable by guests to login
+				if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
+					// This is fine and can be ignored
+				} elseif ($checkModule != 'done') {
+					// Not fine!
+					logDebugMessage(__FILE__, __LINE__, sprintf("Check of module %s results in unexpected value: %s",
+						getModule(),
+						$checkModule
+					));
 				}
 			} else {
 				// Wrong database?
@@ -193,51 +138,45 @@ if ((!isInstalling()) && (isInstalled())) {
 	// Include neccessary functions for installation //
 	///////////////////////////////////////////////////
 
-	// Set other missing variables
-	if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
+	// Default output is 'direct' for HTML output
+	setConfigEntry('OUTPUT_MODE', 'direct');
+
+	// This hack prevents a backtrace in CSS output
+	if (getOutputMode() == 1) {
+		// Problem with config so set output mode
+		setConfigEntry('OUTPUT_MODE', 'render');
+	} // END - if
 
-	// Include databases.php
-	loadIncludeOnce('inc/databases.php');
+	// CFG: DATABASE-TYPE
+	setConfigEntry('_DB_TYPE', 'mysql3');
 
-	// Init session
-	loadIncludeOnce('inc/session.php');
+	// 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
+		loadIncludeOnce($inc);
+	} // END - foreach
 
-	// Load versions
-	loadIncludeOnce('inc/versions.php');
+	// Load config
+	loadIncludeOnce('inc/load_config.php');
 
-	// Check if we are in installation routine
-	if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
-		// Redirect to the installation system
+	// Are we installation routine?
+	if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+		// You have to install first!
 		redirectToUrl('install.php');
 	} // END - if
 
-	// Double-check installation mode
-	if ((!isInstalled()) || (!isAdminRegistered())) {
-		// Check for file permissions
-		if (!isIncludeWriteable('config')) {
-			addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
-		} // END - if
-		if (!isIncludeWriteable('dummy')) {
-			addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
-		} // END - if
-		if (!isIncludeWriteable('.secret/dummy')) {
-			addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
-		} // END - if
-	} // END - if
+	// Init filter system here
+	initFilterSystem();
+
+	// Load cache
+	loadIncludeOnce('inc/load_cache.php');
 
 	// Run the init filter chain
 	runFilterChain('init');
-
-	// Load extension 'sql_patches'
-	LOAD_EXTENSION('sql_patches');
 }
 
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
-	// One or more fatal error(s) occur during connect...
-	loadIncludeOnce('inc/header.php');
-	loadIncludeOnce('inc/fatal_errors.php');
-	loadIncludeOnce('inc/footer.php');
-} // END - if
+// Handle fatal errors
+runFilterChain('handle_fatal_errors');
 
-//
+// [EOF]
 ?>