X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fload_config.php;h=fce7ca86967a46abc9bd8818c3728bcda1f78e88;hb=19b197c32c96ce8eea26561fb7b40e87c57716ae;hp=f17c928bbe6a3f0300a6767ea35ca22edd39d784;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git

diff --git a/inc/load_config.php b/inc/load_config.php
index f17c928bbe..fce7ca8696 100644
--- a/inc/load_config.php
+++ b/inc/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');
@@ -61,7 +62,7 @@ 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.');
+	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>'.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(getConfig('CACHE_PATH') . 'config-local.php');
@@ -85,17 +86,17 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl
 // Check if the user setups his MySQL 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()) && (!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--}');
+	loadTemplate('admin_settings_saved', false, '<div>{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }
 
 // [EOF]