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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a8d95cf98f..a31a7879a7 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,267 +38,228 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
-define('DEBUG_SQL', false);
-
 // Non-database functions
-require_once(PATH."inc/functions.php");
-
-// Filter functions
-require_once(PATH."inc/filters.php");  
-
-// Functions which interact with the database
-require_once(PATH."inc/mysql-manager.php");
-
-// Load extensions and language
-require_once(PATH."inc/extensions.php");
+require('inc/functions.php');
 
-// Load database library
-require_once(PATH."inc/db/lib.php");
+// Wrapper functions
+require('inc/wrapper-functions.php');
 
-// Error handler function
-function __errorHandler ($errno, $errstr, $errfile, $errline) {
-	// Construct message
-	$msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
-		$errno,
-		$errstr,
-		basename($errfile),
-		$errline
-	);
-
-	// Write debug log message
-	DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true);
-
-	// Output message to user and die
-	if (EXT_IS_ACTIVE("debug")) {
-		// Debug extension found! :-)
-		die("Error message written to debug.log. Please try to call <a href=\"".URL."\">the main page</a> to continue.");
-	} else {
-		// No debug extension found
-		print("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
-		debug_print_backtrace();
-		die("</pre>Thank you for your help finding bugs.");
-	}
-}
+// 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) {
+	// Load special functions
+	loadIncludeOnce('inc/' . $lib . '.php');
+} // END - foreach
 
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Call-back function for running shutdown functions and close database connection
-function __SHUTDOWN_HOOK () {
-	global $link;
+// Disable block-mode by default
+enableBlockMode(false);
 
-	// Call the filter chain 'shutdown'
-	RUN_FILTER('shutdown', null, false);
+// Init error handler
+initErrorHandler();
 
-	if (is_resource($link)) {
-		// Close link
-		SQL_CLOSE($link, __FILE__, __LINE__);
-	} else {
-		// No database link
-		ADD_FATAL(NO_DB_LINK);
-	}
-}
+// Init request
+initRequest();
 
-// Register shutdown hook
-register_shutdown_function('__SHUTDOWN_HOOK');
+// Set important header_sent
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
 
-// Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
-	// No login entered and outside installation mode
-	echo "<STRONG>".LANG_WARNING.":</STRONG> ";
-	if (isBooleanConstantAndTrue('mxchange_installed')) {
-		// You have changed my configuration file!
-		die(DIE_CONFIG_CHANGED_YOU);
-	} else {
-		// Please run the installation script (maybe again)
-		die(DIE_RUN_INSTALL_MYSQL);
-	}
-} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
-	// No database password entered!!!
-	echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
-}
-
-// Set dummy $_CONFIG array
-$_CONFIG = array(
-	'code_length' => 0,
-	'patch_level' => 0,
-	'last_update' => time()
-);
+// Init fatal messages
+initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((!isInstalling()) && (isInstalled())) {
+	// Load "databases" aka static arrays
+	loadIncludeOnce('inc/databases.php');
+
+	// Load configuration file(s) here
+	loadIncludeOnce('inc/load_config.php');
+
 	// Check for write-permission for config.php and inc directory
-	if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
+	if (!isModuleSet()) setModule(REQUEST_GET('module'));
+	if (!isModuleSet()) setModule('index');
 
 	// CSS array
-	$EXT_CSS_FILES = array();
+	EXT_INIT_CSS_FILES();
 
-	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
-		global $link;
-		$link = 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 (is_resource($link)) {
-			// Choose the database
-			global $db;
-			$db = SQL_SELECT_DB($MySQL['dbase'], $link, __FILE__, __LINE__);
+		if (SQL_IS_LINK_UP()) {
+			// Enable exit on error
+			enableExitOnError();
 
 			// Is it a valid resource?
-			if ($db === true) {
+			if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
 				// This is required for extension 'optimize' to work
-				define('__DB_NAME', $MySQL['dbase']);
+				define('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
 				// Remove MySQL array from namespace
-				unset($MySQL);
+				unset($GLOBALS['mysql']);
 
 				// Load configuration stuff
-				$_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
+				loadConfiguration();
 
-				// Load "databases" aka static arrays
-				require_once(PATH."inc/databases.php");
+				// Init session
+				loadIncludeOnce('inc/session.php');
 
-				// Loading patching system is required here...
-				require_once(PATH."inc/patch-system.php"); // Initialize patch system
+				// Load versions
+				loadIncludeOnce('inc/versions.php');
 
-				// Session management
-				require_once(PATH."inc/session.php");
+				// Loading patching system is required here...
+				loadIncludeOnce('inc/patch-system.php');
 
 				// Run daily reset
-				require_once(PATH."inc/check-reset.php");
+				loadIncludeOnce('inc/check-reset.php');
 
 				// Load admin include file if he is admin
 				if (IS_ADMIN()) {
 					// Administrative functions
-					require_once(PATH."inc/modules/admin/admin-inc.php");
+					loadIncludeOnce('inc/modules/admin/admin-inc.php');
 				} // END - if
-				//* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
+				//* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000);
 				//* DEBUG: */ die();
 
 				// Get all values
-				if (($CSS != 1) && ($CSS != -1)) {
-					if (empty($GLOBALS['module']))  $GLOBALS['module'] = "empty";
-					if (empty($GLOBALS['what']))    $GLOBALS['what']   = GET_WHAT($GLOBALS['module']);
-					if (empty($GLOBALS['action']))  $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
+				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
-					$GLOBALS['action'] = "";
-					$GLOBALS['what']   = "";
+					setAction('');
+					setWhat('');
 				}
 
 				// Run the init filter chain
-				RUN_FILTER('init');
+				runFilterChain('init');
 
 				// Set default 'what' value
-				//* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
-				if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
-					if ($GLOBALS['module'] == "admin") {
+				//* DEBUG: */ OUTPUT_HTML('-'.getModule().'/'.getWhat()."-<br />");
+				if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+					if (getModule() == 'admin') {
 						// Set 'action' value to 'login' in admin menu
-						$GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
-					} elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) {
+						setAction(getModeAction(getModule(), getWhat()));
+					} elseif ((getModule() == 'index') || (getModule() == 'login')) {
 						// Set 'what' value to 'welcome' in guest and member menu
-						$GLOBALS['what'] = "welcome";
-						if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
+						setWhat('welcome');
+						if (getConfig('index_home') != '') setWhatFromConfig('index_home');
 					} else {
 						// Anything else like begging link
-						$GLOBALS['what'] = "";
+						setWhat('');
 					}
 				} // END - if
 
 				// Update sending pool
-				if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."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
-				$dummy = CHECK_MODULE($GLOBALS['module']);
-				if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
-				unset($dummy);
+				if ((getOutputMode() != '1') && (getOutputMode() != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
+
+				// Check module for permissions
+				$checkModule = checkModulePermissions(getModule());
+				if ($checkModule != 'done') {
+					// Not fine!
+					DEBUG_LOG(__FILE__, __LINE__, sprintf("Check of module %s results in unpexted 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") {
+				if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
 					// Generate random number
-					if (isset($GLOBALS['userid'])) {
-						define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
-					} else {
-						define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
-					}
+					define('RAND_NUMBER', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
 				} else {
 					// Generate weak (!!!) code
 					define('RAND_NUMBER', mt_rand(1000000, 9999999));
 				}
 			} else {
-				// Add language system
-				include (PATH."inc/language.php");
-
 				// Wrong database?
-				ADD_FATAL(WRONG_DB_SELECTED);
+				addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
 			}
 		} else {
-			// Add language system
-			include (PATH."inc/language.php");
-
 			// No link to database!
-			ADD_FATAL(NO_DB_LINK);
-			$db = false;
+			addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
 		}
 	} else {
-		// Add language system
-		include (PATH."inc/language.php");
-
 		// Maybe you forgot to enter your MySQL data?
-		ADD_FATAL(MYSQL_DATA_MISSING);
+		addFatalMessage(__FILE__, __LINE__, getMessage('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') {
+		// Problem with config so set output mode
+		setConfigEntry('OUTPUT_MODE', 'render');
+	} // END - if
+
 	// Set other missing variables
-	if (!isset($CSS)) $CSS = "0";
-	$link = false; // No database link by default
+	if (!isOutputModeSet()) setOutputMode('0');
+
+	// Include databases.php
+	loadIncludeOnce('inc/databases.php');
 
-	// Include required files
-	require_once(PATH."inc/databases.php");
-	require_once(PATH."inc/session.php");
+	// Init session
+	loadIncludeOnce('inc/session.php');
+
+	// Load versions
+	loadIncludeOnce('inc/versions.php');
 
 	// Check if we are in installation routine
-	if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+	if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
 		// Redirect to the installation system
-		LOAD_URL("install.php");
+		redirectToUrl('install.php');
 	} // END - if
 
 	// Double-check installation mode
-	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
+	if ((!isInstalled()) || (!isAdminRegistered())) {
 		// Check for file permissions
-		if (!IS_INC_WRITEABLE("config")) {
-			ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
+		if (!isIncludeWriteable('config')) {
+			addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
 		} // END - if
-		if (!IS_INC_WRITEABLE("dummy")) {
-			ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
+		if (!isIncludeWriteable('dummy')) {
+			addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
 		} // END - if
-		if (!IS_INC_WRITEABLE(".secret/dummy")) {
-			ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
+		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');
 }
 
-// Any fatal messages?
-if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+// 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...
-	include (PATH."inc/header.php");
-	include (PATH."inc/fatal_errors.php");
-	unset($FATAL);
-	include (PATH."inc/footer.php");
-	exit;
+	loadIncludeOnce('inc/header.php');
+	loadIncludeOnce('inc/fatal_errors.php');
+	loadIncludeOnce('inc/footer.php');
 } // END - if
 
 //