X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=11ed8a13e4e5e58c2af4f47abd1ceae91a0ec957;hb=1ebf7f924ecfc037f67e79a43923b3384e9895a3;hp=f52848abc04bb0db01758ac92c0ba85d5d5511af;hpb=2d22333229bc326bbf92e0b4c1603b3290d7fbb5;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index f52848abc0..11ed8a13e4 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -10,9 +10,14 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Verbindet zu Ihrer Datenbank * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * - * Copyright (c) 2003 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -33,263 +38,139 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; - require($INC); -} + die(); +} // END - if -// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log) -define('DEBUG_SQL', false); +// Load more function libraries or includes +foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) { + // Load special functions + loadIncludeOnce('inc/' . $lib . '.php'); +} // END - foreach -// Load database library -require_once(PATH."inc/db/lib.php"); +// Set error handler +set_error_handler('__errorHandler'); -// Non-database functions -require_once(PATH."inc/functions.php"); +// Disable block-mode by default +enableBlockMode(false); -// Filter functions -require_once(PATH."inc/filters.php"); +// Init error handler +initErrorHandler(); -// Functions which interact with the database -require_once(PATH."inc/mysql-manager.php"); +// Init request +initRequest(); -// Load extensions and language -require_once(PATH."inc/extensions.php"); +// Set important header_sent +if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0; -// 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 - ); +// Init fatal messages +initFatalMessages(); - // 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("Thank you for your help finding bugs."); - } -} - -// Set error handler -set_error_handler('__errorHandler'); - -// Call-back function for running shutdown functions -function __run_shutdown_filter () { - // Call the filter chain 'shutdown' - RUN_FILTER('shutdown', null, false); -} - -// Register shutdown hook -register_shutdown_function('__run_shutdown_filter'); - -// 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 - echo "".LANG_WARNING.": "; - if (isBooleanConstantAndTrue('mxchange_installed')) { - // You have changed my configuration file! - die(DIE_CONFIG_CHANGED_YOU); - } else { - // 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'))) { - // No database password entered!!! - echo "".LANG_WARNING.": ".WARN_NULL_PASSWORD; -} +// Init message system +initMessages(); // 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 - if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index"; +if (!isInstalling()) { + // Load configuration file(s) here + loadIncludeOnce('inc/load_config.php'); + + // Load database layer here + loadIncludeOnce('inc/db/lib.php'); // CSS array - $EXT_CSS_FILES = array(); + initExtensionCssFiles(); - if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) { + if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) { // Connect to DB - global $link; - $link = SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__); + SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__); // Is the link valid? - if (is_resource($link)) { - // Choose the database - global $db; - $db = SQL_SELECT_DB($MySQL['dbase'], $link, __FILE__, __LINE__); + if (SQL_IS_LINK_UP()) { + // Enable exit on error + enableExitOnError(); // Is it a valid resource? - if ($db === true) { - // Remove MySQL array from namespace - define('__DB_NAME', $MySQL['dbase']); - unset($MySQL); + if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) { + // This is required for extension 'optimize' to work + setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']); - // Load configuration stuff - $_CONFIG = LOAD_CONFIG(); - - // Initialize include-file-pool - $INC_POOL = array(); - - // Load "databases" aka static arrays - require_once(PATH."inc/databases.php"); - - // Loading patching system is required here... - require_once(PATH."inc/patch-system.php"); // Initialize patch system - - // Session management - require_once(PATH."inc/session.php"); - - // Run daily reset - require_once(PATH."inc/check-reset.php"); - - // Load admin include file if he is admin - if (IS_ADMIN()) { - // 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)) { - if (empty($GLOBALS['module'])) $GLOBALS['module'] = "empty"; - if (empty($GLOBALS['what'])) $GLOBALS['what'] = GET_WHAT($GLOBALS['module']); - if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); - } else { - // Set action/what to empty - $GLOBALS['action'] = ""; - $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']); + // Remove MySQL array from namespace + unset($GLOBALS['mysql']); - // Set default 'what' value - //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-