X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=9cce5eac4126d8161a60aa8c8df14f80b184babe;hb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0;hp=266eca12cecc70837bf7b13db55ad8505dd7473c;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index 266eca12ce..9cce5eac41 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -14,11 +14,9 @@ * $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 * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -83,7 +81,7 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab setConfigEntry('OUTPUT_MODE', 'render'); } -// Check if the user setups his MySQL stuff... +// Check if the user setups his database login stuff... if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) { // No login entered and outside installation mode outputHtml('{--MAILER_WARNING--}:'); @@ -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, '
{--MAILER_WARNING--}:
{--WARN_NULL_PASSWORD--}'); + // No database password entered + displayMessage('
{--MAILER_WARNING--}:
{--WARN_NULL_PASSWORD--}'); } // [EOF]