X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a700311bf3af36b74335a1165f962b6cebc90d7a;hb=8ee39f4094e71546b3cf7e4edb97492be0ea349e;hp=3a872ef0a904c566647bef25e3755657a1219c32;hpb=704424669d3318714d19ead16ee71df6dab6450e;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 3a872ef0a9..a700311bf3 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -55,20 +55,30 @@ 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:
"; - debug_print_backtrace(); - die(""); + + // 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 the main page to continue."); + } else { + // No debug extension found + print("Please report this error at forum.mxchange.org:
"); + debug_print_backtrace(); + die("Thanks for your help finding bugs."); + } } // Set error handler @@ -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(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']."-