X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=5e97ba5b0cc6b531a49fea9efc49eb4cf4f9330b;hb=7d14f333e1ca0847509579c575a7d7335a7775e6;hp=80d25fc12c357a969fffd2f6f26e597dd1e89bdf;hpb=e3c80ba24d088d7c8cd300e01356e9f87465ee39;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 80d25fc12c..5e97ba5b0c 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * 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 * * For more information visit: http://www.mxchange.org * @@ -37,14 +42,11 @@ if (!defined('__SECURITY')) { require($INC); } -// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log) -define('DEBUG_SQL', false); - // Non-database functions require("inc/functions.php"); // Load more function libraries or includes -foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) { +foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) { // Load special functions LOAD_INC_ONCE(sprintf("inc/%s.php", $lib)); } // END - foreach @@ -52,11 +54,8 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'fi // Set error handler set_error_handler('__errorHandler'); -// Register shutdown hook -register_shutdown_function('__SHUTDOWN_HOOK'); - // Check if the user setups his MySQL stuff... -if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isInstalled())) { +if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) { // No login entered and outside installation mode OUTPUT_HTML("{--LANG_WARNING--}: "); if (isInstalled()) { @@ -66,7 +65,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_I // Please run the installation script (maybe again) mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}"); } -} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { +} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { // No database password entered!!! OUTPUT_HTML("