diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-26 08:57:00 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-26 08:57:00 +0000 |
| commit | eb0586728f3c710a149948323ad49832e6ea8a2c (patch) | |
| tree | 8ea0ac9cca9eecb56f97d4f5e6c85ec92e018ffd /roundcubemail | |
| parent | 3ea296e151a18e9c30e656ca9767a34b74c527a3 (diff) | |
- small improvements
git-svn-id: https://svn.roundcube.net/trunk@3667 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/installer/test.php | 12 | ||||
| -rw-r--r-- | roundcubemail/installer/utils.php | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/roundcubemail/installer/test.php b/roundcubemail/installer/test.php index f1218c34f..e75ef2770 100644 --- a/roundcubemail/installer/test.php +++ b/roundcubemail/installer/test.php @@ -119,7 +119,7 @@ else { ?> -<h3>Check configured database settings</h3> +<h3>Check DB config</h3> <?php $db_working = false; @@ -211,7 +211,7 @@ if ($db_working) { ?> -<h3>Test SMTP settings</h3> +<h3>Test SMTP config</h3> <p> Server: <?php echo $RCI->getprop('smtp_server', 'PHP mail()'); ?><br /> @@ -244,10 +244,10 @@ $to_field = new html_inputfield(array('name' => '_to', 'id' => 'sendmailto')); <?php -if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to'])) { - +if (isset($_POST['sendmail'])) { + echo '<p>Trying to send email...<br />'; - + if (preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_from'])) && preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_to']))) { @@ -326,7 +326,7 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to'] <p><input type="submit" name="sendmail" value="Send test mail" /></p> -<h3>Test IMAP configuration</h3> +<h3>Test IMAP config</h3> <?php diff --git a/roundcubemail/installer/utils.php b/roundcubemail/installer/utils.php index 1c101058f..a18dc61aa 100644 --- a/roundcubemail/installer/utils.php +++ b/roundcubemail/installer/utils.php @@ -50,4 +50,3 @@ function raise_error($p) $rci = rcube_install::get_instance(); $rci->raise_error($p); } - |