X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-connect.php;h=230c4b91d9f65cc39750a8ec4ec892ad4665fd8f;hb=bfe24b8d5abcc23e3330580c3ffbeab93166b29b;hp=57737072c9978234ead83b7e13da54fb5dcb692d;hpb=b91d882dbd9bb78ee175a108b5ee0dfcd29d5bbc;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 57737072c9..230c4b91d9 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -32,7 +32,7 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } @@ -49,11 +49,43 @@ require_once(PATH."inc/db/lib.php"); // Load general functions require_once(PATH."inc/functions.php"); // Non-database functions + +// Load more include files +require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database + +// Load extensions and language require_once(PATH."inc/extensions.php"); -require_once(PATH."inc/language.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__.":".$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 +set_error_handler('__errorHandler'); // Check if the user setups his MySQL stuff... -if ((empty($MySQL['login'])) && (!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) { +if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) { // No login entered and outside installation mode echo "".LANG_WARNING.": "; if (isBooleanConstantAndTrue('mxchange_installed')) { @@ -63,7 +95,7 @@ if ((empty($MySQL['login'])) && (!isBooleanConstantAndTrue('mxchange_installing' // 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'))) { +} elseif ((!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { // No database password entered!!! echo "".LANG_WARNING.": ".WARN_NULL_PASSWORD; } @@ -72,10 +104,8 @@ if ((empty($MySQL['login'])) && (!isBooleanConstantAndTrue('mxchange_installing' 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']))) { - if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE); - 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']))) { @@ -91,8 +121,9 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Is it a valid resource? if ($db === true) { - // Load more include files - require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database + // Remove MySQL array from namespace + define('__DB_NAME', $MySQL['dbase']); + unset($MySQL); // Load configuration stuff $_CONFIG = LOAD_CONFIG(); @@ -117,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)) { @@ -135,11 +168,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Update online list UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); - // Load theme name - $currTheme = GET_CURR_THEME(); - // Set default 'what' value - //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-