X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fload_config.php;h=541bde300c39863c872ac01d7e031245ef4faff5;hb=7a27c44db48d021c1e54a76916914ef41ff49372;hp=51b4aeee1607715b11f64d5577d245049179b88a;hpb=f8da178ba4b2f0ed9bfd303d6d32f62b0919a442;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index 51b4aeee16..541bde300c 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -1,7 +1,7 @@ inc/config.php along with the new file inc/cache/config-local.php. Please remove inc/config.php to avoid incompatiblity issues. Thank you.'); -} elseif (isIncludeReadable('inc/cache/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('inc/cache/config-local.php'); + loadIncludeOnce(getCachePath() . 'config-local.php'); // Mark configuration as loaded $GLOBALS['config_local_loaded'] = true; @@ -75,32 +73,29 @@ if ((isIncludeReadable('inc/cache/config-local.php')) && (isIncludeReadable('inc } elseif (isInstalling()) { // Set some essential constants // @TODO Rewrite them to avoid this else block - define('MAIN_TITLE', 'Your mail-exchanger title'); - define('SLOGAN' , 'Your cool slogan here'); - define('WEBMASTER' , 'you@some-hoster.tld.invalid'); + setConfigEntry('MAIN_TITLE', 'Your mail-exchanger title'); + setConfigEntry('SLOGAN' , 'Your cool slogan here'); + setConfigEntry('WEBMASTER' , 'you@some-hoster.tld.invalid'); // Set output mode here setConfigEntry('OUTPUT_MODE', 'render'); -} else { - // Problem in application detected - debug_report_bug('Wether we are not installing nor config-local.php is created!'); } -// Check if the user setups his MySQL stuff... -if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('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 - OUTPUT_HTML('{--LANG_WARNING--}: '); + outputHtml('{--MAILER_WARNING--}:'); if (isInstalled()) { // You have changed my configuration file! - app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}'); + debug_report_bug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}'); } else { // Please run the installation script (maybe again) - app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}'); + debug_report_bug(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}'); } -} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) { - // No database password entered!!! - OUTPUT_HTML('