X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a8d95cf98fd0b49b5a2ed8300c5d47f91f9a1eae;hb=c3b3af29e6e80926519ade146ac657c036782bd3;hp=7bbaee5e1ea1b72aef8816547f227a8d55ab3b0b;hpb=0211214187aa95bd5726ecc7dac13dfe0f699c63;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 7bbaee5e1e..a8d95cf98f 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -40,22 +40,21 @@ if (!defined('__SECURITY')) { // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log) define('DEBUG_SQL', false); -// Default is not a frameset -global $isFrameset; -$isFrameset = false; +// Non-database functions +require_once(PATH."inc/functions.php"); -// Load library -require_once(PATH."inc/db/lib.php"); - -// Load general functions -require_once(PATH."inc/functions.php"); // Non-database functions +// Filter functions +require_once(PATH."inc/filters.php"); -// Load more include files -require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database +// Functions which interact with the database +require_once(PATH."inc/mysql-manager.php"); // Load extensions and language require_once(PATH."inc/extensions.php"); +// Load database library +require_once(PATH."inc/db/lib.php"); + // Error handler function function __errorHandler ($errno, $errstr, $errfile, $errline) { // Construct message @@ -67,7 +66,7 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) { ); // Write debug log message - DEBUG_LOG(__FUNCTION__.":".$msg, true); + DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true); // Output message to user and die if (EXT_IS_ACTIVE("debug")) { @@ -75,15 +74,34 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) { 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:
"); + print("Please report this error at bugs.mxchange.org:Thank you for your help finding bugs."); } } // Set error handler set_error_handler('__errorHandler'); +// Call-back function for running shutdown functions and close database connection +function __SHUTDOWN_HOOK () { + global $link; + + // Call the filter chain 'shutdown' + RUN_FILTER('shutdown', null, false); + + if (is_resource($link)) { + // Close link + SQL_CLOSE($link, __FILE__, __LINE__); + } else { + // No database link + ADD_FATAL(NO_DB_LINK); + } +} + +// Register shutdown hook +register_shutdown_function('__SHUTDOWN_HOOK'); + // Check if the user setups his MySQL stuff... if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) { // No login entered and outside installation mode @@ -95,11 +113,18 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G // Please run the installation script (maybe again) die(DIE_RUN_INSTALL_MYSQL); } -} elseif ((!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { +} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { // No database password entered!!! echo "".LANG_WARNING.": ".WARN_NULL_PASSWORD; } +// Set dummy $_CONFIG array +$_CONFIG = array( + 'code_length' => 0, + 'patch_level' => 0, + 'last_update' => time() +); + // Check if this file is writeable or read-only and warn the user if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) { // Check for write-permission for config.php and inc directory @@ -121,15 +146,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Is it a valid resource? if ($db === true) { - // Remove MySQL array from namespace + // This is required for extension 'optimize' to work define('__DB_NAME', $MySQL['dbase']); + + // Remove MySQL array from namespace unset($MySQL); // Load configuration stuff - $_CONFIG = LOAD_CONFIG(); - - // Initialize include-file-pool - $INC_POOL = array(); + $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG()); // Load "databases" aka static arrays require_once(PATH."inc/databases.php"); @@ -137,8 +161,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Loading patching system is required here... require_once(PATH."inc/patch-system.php"); // Initialize patch system - // Functions which are related to themes - require_once(PATH."inc/theme-manager.php"); + // Session management + require_once(PATH."inc/session.php"); // Run daily reset require_once(PATH."inc/check-reset.php"); @@ -148,7 +172,7 @@ 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: */ ADD_POINTS_REFSYSTEM("test", 36, 1000); //* DEBUG: */ die(); // Get all values @@ -162,11 +186,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT $GLOBALS['what'] = ""; } - // Secure and validate user ID from cookie - UPDATE_LOGIN_DATA(); - - // Update online list - UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); + // Run the init filter chain + RUN_FILTER('init'); // Set default 'what' value //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-"); debug_print_backtrace(); - die("Thanks for your help finding bugs."); + die("