X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=2a59160ec13213d70ed5e5adc00c9d6d122f8cf8;hb=47ee9a6f57f1b85e16acf0c8757b1039a0879fe5;hp=6ecd46300d49a80999c7a5683fffd8dcdb83022c;hpb=4f2414a0134da82027fce8a6c98696a207c8c8cc;p=mailer.git

diff --git a/inc/load_config.php b/inc/load_config.php
index 6ecd46300d..2a59160ec1 100644
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/04/2009 *
- * ===============                              Last change: 04/04/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 04/04/2009 *
+ * ===================                          Last change: 04/04/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_config.php                                  *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -52,7 +53,7 @@ $GLOBALS['config_local_loaded'] = false;
 // Is the local configuration there?
 if ((isIncludeReadable(getConfig('CACHE_PATH') . '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');
@@ -80,13 +81,10 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl
 
 	// Set output mode here
 	setConfigEntry('OUTPUT_MODE', 'render');
-} else {
-	// Redirect to install.php
-	redirectToUrl('install.php');
 }
 
 // Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
 	// No login entered and outside installation mode
 	outputHtml('<strong>{--LANG_WARNING--}:</strong>');
 	if (isInstalled()) {
@@ -96,7 +94,7 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestEl
 		// 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')) {
+} elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
 	// No database password entered!!!
 	loadTemplate('admin_settings_saved', false, '<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }