New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

[mailer.git] / inc / load_config.php

diff --git a/inc/load_config.php b/inc/load_config.php
index 26d35e68c86a03e63b95fd4b253d9d7d30a209f9..51b4aeee1607715b11f64d5577d245049179b88a 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -47,20 +47,60 @@ setConfigEntry('OUTPUT_MODE' , 'render');
 setConfigEntry('WRITE_FOOTER', 'Y');
 setConfigEntry('_DB_TYPE'    , 'mysql3');
 
+// Mark configuration as NOT loaded which is the default
+$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
        define('MAIN_TITLE', 'Your mail-exchanger title');
        define('SLOGAN'    , 'Your cool slogan here');
        define('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())) {
+       // No login entered and outside installation mode
+       OUTPUT_HTML('<strong>{--LANG_WARNING--}:</strong> ');
+       if (isInstalled()) {
+               // You have changed my configuration file!
+               app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
+       } else {
+               // Please run the installation script (maybe again)
+               app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
+       }
+} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
+       // No database password entered!!!
+       OUTPUT_HTML('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+}
+
 //
 ?>