X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fload_config.php;h=ee94c6f58243ff1bfd12a142f7fc107cfa0ae0d1;hb=a00ad7dd8c36a5322e28f38d8d641efb90c00c92;hp=e38c041606ca08402fd2d1b2964afeae9c5662da;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/load_config.php b/inc/load_config.php
index e38c041606..ee94c6f582 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                                  *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -47,12 +46,12 @@ setConfigEntry('WRITE_FOOTER', 'Y');
 setConfigEntry('_DB_TYPE'    , 'mysql3');
 
 // Mark configuration as NOT loaded which is the default
-$GLOBALS['config_local_loaded'] = false;
+$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,13 +60,13 @@ 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')) {
+	reportBug(__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;
+	$GLOBALS['config_local_loaded'] = TRUE;
 } elseif (isIncludeReadable('inc/config.php')) {
 	// Out-dated inc/config.php found, falling back to load and "wrap" it
 	updateOldConfigFile();
@@ -76,30 +75,27 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl
 	// @TODO Rewrite them to avoid this else block
 	setConfigEntry('MAIN_TITLE', 'Your mail-exchanger title');
 	setConfigEntry('SLOGAN'    , 'Your cool slogan here');
-	setConfigEntry('WEBMASTER' , 'you@some-hoster.tld.invalid');
+	setConfigEntry('WEBMASTER' , 'you@some-hoster.example');
 
 	// 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()) && (!isInstaller()) && (!isGetRequestElementSet('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--}');
+		reportBug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
 	} else {
 		// Please run the installation script (maybe again)
-		app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
+		reportBug(__FILE__, __LINE__, '{--DIE_RUN_INSTALLER_MYSQL--}');
 	}
-} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
-	// No database password entered!!!
-	outputHtml('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+} elseif ((!isInstalling()) && (!isInstaller()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
+	// No database password entered
+	displayMessage('<div class="warning">{--MAILER_WARNING--}</div> {--WARN_NULL_PASSWORD--}');
 }
 
-//
+// [EOF]
 ?>