X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=8f8e5cd41d760e6f51c304ea5c1e4da407626378;hb=7076b0bf4f326c0dcb87daa0e02e15b0f42e619e;hp=4020ecdc46b587d4eb4cc0e2701303521d7990e5;hpb=2cce06a4f4ff6bdbf0a14dcf7d2a89944b472c69;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 4020ecdc46..8f8e5cd41d 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>Thank you 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'))) {
@@ -112,6 +122,7 @@ 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
@@ -137,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("test", 36, 1000);
+				//* DEBUG: */ die();
 
 				// Get all values
 				if (($CSS != 1) && ($CSS != -1)) {
@@ -156,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
@@ -196,15 +209,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 					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);
 	}