X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=6124c29e4d9dc2f06605fc8f5385618299d92b10;hp=a31a7879a771721428e0be637e964fa6a8854d27;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=b8aa17b98b99c27eafbdca0fa090bae63527da9a

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a31a7879a7..6124c29e4d 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                                *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,18 +37,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');
-
-// Wrapper functions
-require('inc/wrapper-functions.php');
+	die();
+} // END - if
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+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) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -66,28 +58,36 @@ 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();
 
-// Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (isInstalled())) {
-	// Load "databases" aka static arrays
-	loadIncludeOnce('inc/databases.php');
+// Init repository data sub-system
+initRepositoryData();
+
+// Enable HTML templates by default
+enableTemplateHtml();
 
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
-	// Check for write-permission for config.php and inc directory
-	if (!isModuleSet()) setModule(REQUEST_GET('module'));
-	if (!isModuleSet()) setModule('index');
+	// Load database layer here
+	loadIncludeOnce('inc/db/lib.php');
+
+	// Init message system
+	initMessages();
 
 	// CSS array
-	EXT_INIT_CSS_FILES();
+	initExtensionCssFiles();
 
-	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
+	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__);
 
@@ -99,168 +99,73 @@ if ((!isInstalling()) && (isInstalled())) {
 			// Is it a valid resource?
 			if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
 				// This is required for extension 'optimize' to work
-				define('__DB_NAME', $GLOBALS['mysql']['dbase']);
+				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
 				// Remove MySQL array from namespace
 				unset($GLOBALS['mysql']);
 
-				// Load configuration stuff
-				loadConfiguration();
-
-				// Init session
-				loadIncludeOnce('inc/session.php');
-
-				// Load versions
-				loadIncludeOnce('inc/versions.php');
-
-				// Loading patching system is required here...
-				loadIncludeOnce('inc/patch-system.php');
-
-				// 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 ((getOutputMode() != 1) && (getOutputMode() != -1)) {
-					if (!isModuleSet())  setModule('empty');
-					if (!isWhatSet())    setWhat(getWhatFromModule(getModule()));
-					if (!isActionSet())  setAction(getModeAction(getModule(), getWhat()));
-				} else {
-					// Set action/what to empty
-					setAction('');
-					setWhat('');
-				}
-
-				// Run the init filter chain
-				runFilterChain('init');
-
-				// Set default 'what' value
-				//* DEBUG: */ OUTPUT_HTML('-'.getModule().'/'.getWhat()."-<br />");
-				if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
-					if (getModule() == 'admin') {
-						// Set 'action' value to 'login' in admin menu
-						setAction(getModeAction(getModule(), getWhat()));
-					} elseif ((getModule() == 'index') || (getModule() == 'login')) {
-						// Set 'what' value to 'welcome' in guest and member menu
-						setWhat('welcome');
-						if (getConfig('index_home') != '') setWhatFromConfig('index_home');
-					} else {
-						// Anything else like begging link
-						setWhat('');
-					}
-				} // END - if
-
-				// Update sending pool
-				if ((getOutputMode() != '1') && (getOutputMode() != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
+				// Load cache
+				loadIncludeOnce('inc/load_cache.php');
 
 				// Check module for permissions
-				$checkModule = checkModulePermissions(getModule());
-				if ($checkModule != 'done') {
+				$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!
-					DEBUG_LOG(__FILE__, __LINE__, sprintf("Check of module %s results in unpexted value: %s",
+					logDebugMessage(__FILE__, __LINE__, sprintf("Check of module %s results in unexpected value: %s",
 						getModule(),
 						$checkModule
 					));
-				} // END - if
-
-				// 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', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
-				} else {
-					// Generate weak (!!!) code
-					define('RAND_NUMBER', mt_rand(1000000, 9999999));
 				}
 			} else {
 				// Wrong database?
-				addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
+				addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
 			}
 		} else {
 			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
+			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
 		}
 	} else {
 		// Maybe you forgot to enter your MySQL data?
-		addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
+		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
 	}
 } else {
-	///////////////////////////////////////////////////
-	// Include neccessary functions for installation //
-	///////////////////////////////////////////////////
-
 	// Default output is 'direct' for HTML output
 	setConfigEntry('OUTPUT_MODE', 'direct');
 
 	// This hack prevents a backtrace in CSS output
-	if (getOutputMode() == '1') {
+	if (isCssOutputMode()) {
 		// Problem with config so set output mode
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
 
-	// Set other missing variables
-	if (!isOutputModeSet()) setOutputMode('0');
+	// CFG: DATABASE-TYPE
+	setConfigEntry('_DB_TYPE', 'mysql3');
 
-	// Include databases.php
-	loadIncludeOnce('inc/databases.php');
+	// Load database layer here
+	loadIncludeOnce('inc/db/lib.php');
 
-	// Init session
-	loadIncludeOnce('inc/session.php');
+	// Init message system
+	initMessages();
 
-	// Load versions
-	loadIncludeOnce('inc/versions.php');
+	// Include more
+	foreach (array('databases','session','versions','install-functions','load_config','load_cache') as $inc) {
+		// Load the include
+		loadIncludeOnce('inc/' . $inc . '.php');
+	} // END - foreach
 
-	// Check if we are in installation routine
-	if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
-		// Redirect to the installation system
+	// Check wether we are in installation routine
+	if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+		// Redirect to the URL
 		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
-
-	// Run the init filter chain
-	runFilterChain('init');
-
-	// Load extension 'sql_patches'
-	LOAD_EXTENSION('sql_patches');
-
-	// Load configuration file(s) here
-	loadIncludeOnce('inc/load_config.php');
 }
 
-// Init session
-loadIncludeOnce('inc/session.php');
-
-// Load versions
-loadIncludeOnce('inc/versions.php');
-
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && (getOutputMode() != '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]
 ?>