X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=d6f032f00712cac499a77e5439ef39c344a5f26f;hb=refs%2Fheads%2Fserver-0.2.1-FINAL%2Fshipsimu-org;hp=483a4d270b76a17ef49f250a65ee75345d710fd1;hpb=e49c041711e84fe5d57ab1120bda59eea6ab4773;p=mailer.git

diff --git a/inc/load_config.php b/inc/load_config.php
index 483a4d270b..d6f032f007 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 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +38,7 @@ 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;
@@ -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]