More rewrites to make use of (cached) wrapper functions

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 17c0c0c6331bbb4e9ef5e4b56faa788223e8b636..0b8928b27ce1bfc126c2da8a6c11284b2f161d04 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -58,25 +58,25 @@ if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
        // Okay, we have to check it
        if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
                // Hostname not set
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 
        if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
                // Password is empty
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 
        if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
                // Password repeat is empty
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 
        if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
                // Passwords are not matching
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 } // END - if
@@ -202,7 +202,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                // Check for dumps
                                                if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found!
-                                                       addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+                                                       addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
                                                        return;
                                                } // END - if
 
@@ -234,7 +234,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        // Are some SQLs found?
                                                        if (countSqls() == 0) {
                                                                // Abort here
-                                                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+                                                               addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
                                                                return;
                                                        } // END - if
 
@@ -273,7 +273,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                }
                        } else {
                                // Something goes wrong during installation! :-(
-                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+                               addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
                        }
                        break;
 
@@ -294,7 +294,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
        } // END - switch
 } else {
        // Already installed!
-       addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+       addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 }
 
 // [EOF]