X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a700311bf3af36b74335a1165f962b6cebc90d7a;hp=fd24ac49037b6b064a069172a52d0f7a748cf886;hb=fc7f4d7fd71c718503c2af305276f5a374ae24da;hpb=254afbdb1fa4699a98667bad4e792ad803a0d535

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index fd24ac4903..a700311bf3 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -55,24 +55,34 @@ require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the
 
 // Load extensions and language
 require_once(PATH."inc/extensions.php");
-require_once(PATH."inc/language.php");
 
-// Init error handler
+// 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
 	);
-	DEBUG_LOG(__FUNCTION__.":".$msg, true);
-	print "Please report this error:<pre>";
-	debug_print_backtrace();
-	die("</pre>");
+
+	// 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://forum.mxchange.org\" target=\"_blank\">forum.mxchange.org</a>:<pre>");
+		debug_print_backtrace();
+		die("</pre>Thanks for your help finding bugs.");
+	}
 }
 
 // Set error handler
-//set_error_handler('__errorHandler');
+set_error_handler('__errorHandler');
 
 // Check if the user setups his MySQL stuff...
 if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
@@ -94,10 +104,8 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
 	// Check for write-permission for config.php and inc directory
 	if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
-	if (($GLOBALS['module'] != "admin") && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_SERVER['WINDIR']))) {
-		// DEPRECATED: if (is_INCWritable("config"))     ADD_FATAL(FATAL_CONFIG_WRITABLE);
-		// DEPRECATED: if (is_INCWritable("dummy"))      ADD_FATAL(FATAL_INC_WRITABLE);
-	}
+
+	// CSS array
 	$EXT_CSS_FILES = array();
 
 	if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
@@ -113,6 +121,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
 			// Is it a valid resource?
 			if ($db === true) {
+				// Remove MySQL array from namespace
+				define('__DB_NAME', $MySQL['dbase']);
+				unset($MySQL);
+
 				// Load configuration stuff
 				$_CONFIG = LOAD_CONFIG();
 
@@ -136,6 +148,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 					// Administrative functions
 					require_once(PATH."inc/modules/admin/admin-inc.php");
 				} // END - if
+				//* DEBUG: */ ADD_POINTS_REFSYSTEM(36,1000);
+				//* DEBUG: */ die();
 
 				// Get all values
 				if (($CSS != 1) && ($CSS != -1)) {
@@ -155,7 +169,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
 
 				// Set default 'what' value
-				//* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
+				//* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
 				if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
 					if ($GLOBALS['module'] == "admin") {
 						// Set 'action' value to 'login' in admin menu
@@ -182,22 +196,37 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				// Shall we activate the exchange?
 				if ($_CONFIG['activate_xchange'] > 0) activateExchange();
 
-				// Generate random number
-				if (isset($GLOBALS['userid'])) {
-					define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+				// Is the extension sql_patches installed and at least 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, ""));
+					}
 				} else {
-					define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+					// 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);
 			}
 		} else {
+			// Add language system
+			include (PATH."inc/language.php");
+
 			// No link to database!
 			ADD_FATAL(NO_DB_LINK);
 			$db = false;
 		}
 	} else {
+		// Add language system
+		include (PATH."inc/language.php");
+
 		// Maybe you forgot to enter your MySQL data?
 		ADD_FATAL(MYSQL_DATA_MISSING);
 	}
@@ -223,10 +252,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 	if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {
 		// Redirect to the installation system
 		LOAD_URL("install.php");
-	}
+	} // END - if
 
 	// Double-check installation mode
-	if ((!defined('mxchange_installed')) || (!defined('admin_registered'))) {
+	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
 		// Check for file permissions
 		if (!is_INCWritable("config")) {
 			ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
@@ -237,7 +266,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 		if (!is_INCWritable(".secret/dummy")) {
 			ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
 		}
-	}
+	} // END - if
 }
 
 // Any fatal messages?