X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fload_config.php;h=e0c3ad0ee5c800f7655badcead1061432cff2172;hp=0f277b06e45109a8d524697d5aa935f447062f1b;hb=5d89789720c77e954b2eba28c00ec710dd28900d;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60

diff --git a/inc/load_config.php b/inc/load_config.php
index 0f277b06e4..e0c3ad0ee5 100644
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -14,10 +14,9 @@
  * $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                           *
+ * 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 *
@@ -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 <strong>inc/config.php</strong> along with the new file <strong>'.getConfig('CACHE_PATH').'config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
-} elseif (isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) {
+	debug_report_bug(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at <strong>inc/config.php</strong> along with the new file <strong>'.getCachePath().'config-local.php</strong>. Please remove <strong>inc/config.php</strong> 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;
@@ -80,25 +79,22 @@ 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())) {
+// Check if the user setups his database login stuff...
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
 	// No login entered and outside installation mode
-	outputHtml('<strong>{--LANG_WARNING--}:</strong>');
+	outputHtml('<strong>{--MAILER_WARNING--}:</strong>');
 	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!!!
-	loadTemplate('admin_settings_saved', false, '<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+} elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
+	// No database password entered
+	loadTemplate('admin_settings_saved', false, '<div class="warning">{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }
 
 // [EOF]