New extension added, more EL-rewrites, naming-convention applied:

[mailer.git] / inc / load_config.php

diff --git a/inc/load_config.php b/inc/load_config.php
index 2a59160ec13213d70ed5e5adc00c9d6d122f8cf8..fce7ca86967a46abc9bd8818c3728bcda1f78e88 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -62,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');
@@ -86,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]