Heacy rewrite/cleanup:

[mailer.git] / inc / load_config.php

diff --git a/inc/load_config.php b/inc/load_config.php
index f3454862f6f55ab6e0f3e89aa59241ecd13079d4..ee94c6f58243ff1bfd12a142f7fc107cfa0ae0d1 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * 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 *
@@ -46,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(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');
@@ -60,13 +60,13 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
        setConfigEntry('OUTPUT_MODE', 'render');
 
        // Both exist! This is bad and should be avoided by the admin
-       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>'.getCachePath().'config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
+       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(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();
@@ -75,26 +75,26 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
        // @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');
 }
 
-// Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('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>{--MAILER_WARNING--}:</strong>');
+       outputHtml('<strong>{--MAILER_WARNING--}</strong>');
        if (isInstalled()) {
                // You have changed my configuration file!
-               debug_report_bug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
+               reportBug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
        } else {
                // Please run the installation script (maybe again)
-               debug_report_bug(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
+               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
-       loadTemplate('admin_settings_saved', false, '<div class="warning">{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+       displayMessage('<div class="warning">{--MAILER_WARNING--}</div> {--WARN_NULL_PASSWORD--}');
 }
 
 // [EOF]