X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fload_config.php;h=51b4aeee1607715b11f64d5577d245049179b88a;hp=f0b36d146a2bf9c54075b714d6c1706bf0aee696;hb=4d64a8575593f7cc8f69aec74d14c29ba6e8ef6c;hpb=0437f06b273f885db05736449a952c6eb72086ca

diff --git a/inc/load_config.php b/inc/load_config.php
index f0b36d146a..51b4aeee16 100644
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -51,12 +51,27 @@ setConfigEntry('_DB_TYPE'    , 'mysql3');
 $GLOBALS['config_local_loaded'] = false;
 
 // Is the local configuration there?
-if (isIncludeReadable('inc/cache/config-local.php')) {
+if ((isIncludeReadable('inc/cache/config-local.php')) && (isIncludeReadable('inc/config.php'))) {
+	// We are better in installation mode
+	$GLOBALS['mxchange_installing'] = true;
+
+	// Define default main_title here
+	define('MAIN_TITLE', 'Your mail-exchange title');
+
+	// Set output mode here
+	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 <strong>inc/config.php</strong> along with the new file <strong>inc/cache/config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
+} elseif (isIncludeReadable('inc/cache/config-local.php')) {
 	// Then load it
 	loadIncludeOnce('inc/cache/config-local.php');
 
 	// Mark configuration as loaded
 	$GLOBALS['config_local_loaded'] = true;
+} elseif (isIncludeReadable('inc/config.php')) {
+	// Out-dated inc/config.php found, falling back to load and "wrap" it
+	updateOldConfigFile();
 } elseif (isInstalling()) {
 	// Set some essential constants
 	// @TODO Rewrite them to avoid this else block