X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=0bb8a7aa3615d0f41c4cfdce9d10e1fcec1c7305;hb=eabcb2e3f319c840d3908b5a21b32f40fce40d2b;hp=f17c928bbe6a3f0300a6767ea35ca22edd39d784;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index f17c928bbe..0bb8a7aa36 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -14,11 +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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 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 * @@ -50,9 +49,9 @@ 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['mxchange_installing'] = true; + $GLOBALS['__mailer_installing'] = true; // Define default main_title here setConfigEntry('MAIN_TITLE', 'Your mail-exchange title'); @@ -61,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 - app_die(__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')) { + reportBug(__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; @@ -76,26 +75,26 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl // @TODO Rewrite them to avoid this else block setConfigEntry('MAIN_TITLE', 'Your mail-exchanger title'); setConfigEntry('SLOGAN' , 'Your cool slogan here'); - setConfigEntry('WEBMASTER' , 'you@some-hoster.tld.invalid'); + setConfigEntry('WEBMASTER' , 'you@some-hoster.example'); // Set output mode here 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('{--LANG_WARNING--}:'); + outputHtml('{--MAILER_WARNING--}:'); if (isInstalled()) { // You have changed my configuration file! - app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}'); + reportBug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}'); } else { // Please run the installation script (maybe again) - app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}'); + reportBug(__FILE__, __LINE__, '{--DIE_RUN_INSTALLER_MYSQL--}'); } } elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) { - // No database password entered!!! - loadTemplate('admin_settings_saved', false, '