X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=88b48f7970118742f375993c2cace2626e3e92be;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hp=0bb8a7aa3615d0f41c4cfdce9d10e1fcec1c7305;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/load_config.php b/inc/load_config.php
index 0bb8a7aa36..88b48f7970 100644
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Lader fuer Konfiguration                         *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,15 +38,15 @@ if (!defined('__SECURITY')) {
 // Set some config entries which is required for installation phase
 setConfigEntry('OUTPUT_MODE' , 'render');
 setConfigEntry('WRITE_FOOTER', 'Y');
-setConfigEntry('_DB_TYPE'    , 'mysql3');
+setConfigEntry('_DB_TYPE'    , 'mysql');
 
 // 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(getCachePath() . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
 	// We are better in installation mode
-	$GLOBALS['__mailer_installing'] = true;
+	$GLOBALS['__mailer_installing'] = TRUE;
 
 	// Define default main_title here
 	setConfigEntry('MAIN_TITLE', 'Your mail-exchange title');
@@ -66,7 +61,7 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
 	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();
@@ -82,9 +77,9 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
 }
 
 // Check if the user setups his database login stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstaller()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
 	// No login entered and outside installation mode
-	outputHtml('<strong>{--MAILER_WARNING--}:</strong>');
+	outputHtml('<strong>{--MAILER_WARNING--}</strong>');
 	if (isInstalled()) {
 		// You have changed my configuration file!
 		reportBug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
@@ -92,9 +87,9 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallation
 		// Please run the installation script (maybe again)
 		reportBug(__FILE__, __LINE__, '{--DIE_RUN_INSTALLER_MYSQL--}');
 	}
-} elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
+} 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--}');
+	displayMessage('<div class="warning">{--MAILER_WARNING--}</div> {--WARN_NULL_PASSWORD--}');
 }
 
 // [EOF]