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

diff --git a/inc/load_config.php b/inc/load_config.php
index f0b36d146a..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                                  *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,8 +39,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 } // END - if
 
 // Set some config entries which is required for installation phase
@@ -51,30 +51,42 @@ setConfigEntry('_DB_TYPE'    , 'mysql3');
 $GLOBALS['config_local_loaded'] = false;
 
 // Is the local configuration there?
-if (isIncludeReadable('inc/cache/config-local.php')) {
+if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
+	// We are better in installation mode
+	$GLOBALS['mailer_installing'] = true;
+
+	// Define default main_title here
+	setConfigEntry('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>'.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')) {
 	// Then load it
-	loadIncludeOnce('inc/cache/config-local.php');
+	loadIncludeOnce(getConfig('CACHE_PATH') . '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');
+	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())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
 	// No login entered and outside installation mode
-	OUTPUT_HTML('<strong>{--LANG_WARNING--}:</strong> ');
+	outputHtml('<strong>{--LANG_WARNING--}:</strong>');
 	if (isInstalled()) {
 		// You have changed my configuration file!
 		app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
@@ -82,10 +94,10 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_
 		// 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!!!
-	OUTPUT_HTML('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+	loadTemplate('admin_settings_saved', false, '<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }
 
-//
+// [EOF]
 ?>