A lot code rewritten:

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 1f70d3aa550c524d7e69bad93157f918e42a65e8..2962d374a7c8f6b002fd92936d57c3ae50f8eb87 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -131,10 +131,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['email']      = postRequestParameter('email');
 
                        // Use default SMTP data
-                       $smtpHost  = getConfig('SMTP_HOSTNAME');
-                       $smtpUser  = getConfig('SMTP_USER');
-                       $smtpPass1 = getConfig('SMTP_PASSWORD');
-                       $smtpPass2 = getConfig('SMTP_PASSWORD');
+                       $smtpHost  = '{?SMTP_HOSTNAME?}';
+                       $smtpUser  = '{?SMTP_USER?}';
+                       $smtpPass1 = '{?SMTP_PASSWORD?}';
+                       $smtpPass2 = '{?SMTP_PASSWORD?}';
 
                        // Overwrite it with the data from sent (failed) form
                        if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
@@ -179,7 +179,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        // MySQL data
                        $OUT = '';
                        foreach ($GLOBALS['install_mysql'] as $key => $value) {
-                               $OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
+                               $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                        } // END - foreach
                        $content['mysql_hidden'] = $OUT;
 
@@ -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]