X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=2337fa7ccab316722e8702be568000d7a0bd3018;hb=4057d55159a6f9bf2b6d40b7b6e9b4c31cae0267;hp=ccbc5ac41e17031e8746011d39d330fb0d953b75;hpb=bd1c7ebbcafe3833b12f782e26b2f7c4460c11f4;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index ccbc5ac41e..2337fa7cca 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -55,7 +55,6 @@ 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 function __errorHandler ($errno, $errstr, $errfile, $errline) { @@ -66,13 +65,13 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) { $errline ); DEBUG_LOG(__FUNCTION__.":".$msg, true); - print "Please report this error:
";
+	print "Please report this error at forum.mxchange.org:
";
 	debug_print_backtrace();
-	die("
"); + die("
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'))) { @@ -111,6 +110,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(); @@ -134,6 +137,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)) { @@ -153,7 +158,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']."-
\n"; + //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) { if ($GLOBALS['module'] == "admin") { // Set 'action' value to 'login' in admin menu