X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-connect.php;h=aa7df75574a5dc4d8808687d9c10f676b7e8a10e;hb=7db7d1ad72783bf7650fbb39a0a00a447b0c147a;hp=fd24ac49037b6b064a069172a52d0f7a748cf886;hpb=254afbdb1fa4699a98667bad4e792ad803a0d535;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index fd24ac4903..aa7df75574 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,224 +38,142 @@ // 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 -// Default is not a frameset -global $isFrameset; -$isFrameset = false; +// Set error handler +set_error_handler('__errorHandler'); -// Load library -require_once(PATH."inc/db/lib.php"); +// Disable block-mode by default +enableBlockMode(false); -// Load general functions -require_once(PATH."inc/functions.php"); // Non-database functions +// Init error handler +initErrorHandler(); -// Load more include files -require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database +// Init request +initRequest(); -// Load extensions and language -require_once(PATH."inc/extensions.php"); -require_once(PATH."inc/language.php"); +// Init userid +initMemberId(); -// Init error handler -function __errorHandler ($errno, $errstr, $errfile, $errline) { - $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(""); -} +// Set important header_sent +if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0'; -// Set error handler -//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'))) { - // 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 fatal messages +initFatalMessages(); + +// 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 (($GLOBALS['module'] != "admin") && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_SERVER['WINDIR']))) { - // DEPRECATED: if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE); - // DEPRECATED: if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE); - } - $EXT_CSS_FILES = array(); +if (!isInstalling()) { + // Load configuration file(s) here + loadIncludeOnce('inc/load_config.php'); + + // Load database layer here + loadIncludeOnce('inc/db/lib.php'); - if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) { + // CSS array + initExtensionCssFiles(); + + 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) { - // 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 - - // Functions which are related to themes - require_once(PATH."inc/theme-manager.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 - - // 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']); - - // Set default 'what' value - //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-