X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fload_config.php;h=541bde300c39863c872ac01d7e031245ef4faff5;hb=840659bfdfe0d0cf891135382818cdc134bf6f2e;hp=fce7ca86967a46abc9bd8818c3728bcda1f78e88;hpb=16e124ec4e2254897bf4394e09af27507049fe9f;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index fce7ca8696..541bde300c 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -14,12 +14,10 @@ * $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 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -51,7 +49,7 @@ setConfigEntry('_DB_TYPE' , 'mysql3'); $GLOBALS['config_local_loaded'] = false; // Is the local configuration there? -if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) { +if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) { // We are better in installation mode $GLOBALS['mailer_installing'] = true; @@ -62,10 +60,10 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl setConfigEntry('OUTPUT_MODE', 'render'); // Both exist! This is bad and should be avoided by the admin - debug_report_bug(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at inc/config.php along with the new file '.getConfig('CACHE_PATH').'config-local.php. Please remove inc/config.php to avoid incompatiblity issues. Thank you.'); -} elseif (isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) { + debug_report_bug(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at inc/config.php along with the new file '.getCachePath().'config-local.php. Please remove inc/config.php to avoid incompatiblity issues. Thank you.'); +} elseif (isIncludeReadable(getCachePath() . 'config-local.php')) { // Then load it - loadIncludeOnce(getConfig('CACHE_PATH') . 'config-local.php'); + loadIncludeOnce(getCachePath() . 'config-local.php'); // Mark configuration as loaded $GLOBALS['config_local_loaded'] = true; @@ -83,8 +81,8 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl setConfigEntry('OUTPUT_MODE', 'render'); } -// Check if the user setups his MySQL stuff... -if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) { +// Check if the user setups his database login stuff... +if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) { // No login entered and outside installation mode outputHtml('{--MAILER_WARNING--}:'); if (isInstalled()) { @@ -95,8 +93,8 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallation debug_report_bug(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}'); } } elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) { - // No database password entered!!! - loadTemplate('admin_settings_saved', false, '