Next stage of HTML rewriting, lesser br-tags

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 84d5e0c1076a3170647b5971baafeef3bc1494d2..e8a13231ec972bb8f007518db6e5ec5695bcc37f 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -57,25 +57,25 @@ if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
        // Okay, we have to check it
        if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
                // Hostname not set
        // Okay, we have to check it
        if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
                // Hostname not set

-               addToInstallContent(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '<br />');
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '</div>');

                setRequestGetElement('page', 3);
        } // END - if
 
        if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
                // Password is empty
                setRequestGetElement('page', 3);
        } // END - if
 
        if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
                // Password is empty

-               addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '<br />');
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '</div>');

                setRequestGetElement('page', 3);
        } // END - if
 
        if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
                // Password repeat is empty
                setRequestGetElement('page', 3);
        } // END - if
 
        if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
                // Password repeat is empty

-               addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '<br />');
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '</div>');

                setRequestGetElement('page', 3);
        } // END - if
 
        if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
                // Passwords are not matching
                setRequestGetElement('page', 3);
        } // END - if
 
        if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
                // Passwords are not matching

-               addToInstallContent(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '<br />');
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '</div>');

                setRequestGetElement('page', 3);
        } // END - if
 } // END - if
                setRequestGetElement('page', 3);
        } // END - if
 } // END - if


@@ -100,11 +100,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
                        if (empty($mysql['type']))   $mysql['type']   = 'MyISAM';
                        if (getTotalFatalErrors() > 0) {
                        if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
                        if (empty($mysql['type']))   $mysql['type']   = 'MyISAM';
                        if (getTotalFatalErrors() > 0) {

-                               addToInstallContent('<span class="install_fatal">');
+                               addToInstallContent('<div class="install_fatal">');

                                foreach (getFatalArray() as $key => $err) {
                                foreach (getFatalArray() as $key => $err) {

-                                       addToInstallContent('<strong>&middot;</strong>&nbsp;{--FATAL_NO--}' . ($key + 1) . ':&nbsp;' . $err . '<br />');
+                                       addToInstallContent('<div class="para"><strong>&middot;</strong>&nbsp;{--FATAL_NO--}' . ($key + 1) . ':&nbsp;' . $err . '</div>');

                                }
                                }

-                               addToInstallContent('</span><br />');
+                               addToInstallContent('</div>');

                        }
                        $content['mysql_host']   = $mysql['host'];
                        $content['mysql_dbase']  = $mysql['dbase'];
                        }
                        $content['mysql_host']   = $mysql['host'];
                        $content['mysql_dbase']  = $mysql['dbase'];