From f0cc628bdbde05c149527eb00ff4e8a0504e4c61 Mon Sep 17 00:00:00 2001 From: till Date: Mon, 25 Feb 2008 10:12:56 +0000 Subject: * bugfix: wouldn't take supplied user/pass from check.php to send smtp email * removed tabs (DO NOT USE THEM!!!) * bugfix: $send_headers was not set at all * decrypt_passwd() shouldn't be necessary anymore (because we "inject" the form params into $CONFIG) --- check.php-dist | 103 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 47 deletions(-) diff --git a/check.php-dist b/check.php-dist index 0cc9a000e..72b35030a 100644 --- a/check.php-dist +++ b/check.php-dist @@ -372,46 +372,43 @@ echo 'Fetching config-settings from config/main.inc.php.

'; if (is_array($rctest_config) && count($rctest_config)) { ?> - - - - - - - - + + + + + + + +
-

SMTP Settings

- 		-

IMAP Settings

-
'; - echo 'server: '.(isset($rctest_config['smtp_server']) && !empty($rctest_config['smtp_server']) ? $rctest_config['smtp_server'] : 'not set').'
'; - echo 'port: '.(isset($rctest_config['smtp_port']) && !empty($rctest_config['smtp_port']) ? $rctest_config['smtp_port'] : 'not set').'
'; - if (isset($rctest_config['smtp_user']) && !empty($rctest_config['smtp_user'])) { - echo 'user: '.$rctest_config['smtp_user'].'
'; - } elseif ($rctest_config['smtp_user'] == '%u') { - echo 'user: use current session
'; - } else { - echo 'user: not set
'; - } - if (isset($rctest_config['smtp_pass']) && !empty($rctest_config['smtp_pass'])) { - echo 'pass: '.$rctest_config['smtp_pass'].'
'; - } elseif (isset($rctest_config['smtp_pass']) && $rctest_config['smtp_pass'] == '%p') { - echo 'pass: use current session
'; - } else { - echo 'pass: not set
'; - } - ?>		'; - if (isset($rctest_config['default_host']) && is_array($rctest_config['default_host'])) { - echo 'server: '.var_export($rctest_config['default_host'], true).'
'; - } elseif (isset($rctest_config['default_host']) && !empty($rctest_config['default_host'])) { - echo 'server: '.$rctest_config['default_host'].'
'; - } else { - echo 'server: not set
'; - } - echo 'port: '.(isset($rctest_config['default_port']) && !empty($rctest_config['default_port']) ? $rctest_config['default_port'] : 'not set').'
'; - ?>

SMTP Settings

IMAP Settings

'; +echo 'server: '.(isset($rctest_config['smtp_server']) && !empty($rctest_config['smtp_server']) ? $rctest_config['smtp_server'] : 'not set').'
'; +echo 'port: '.(isset($rctest_config['smtp_port']) && !empty($rctest_config['smtp_port']) ? $rctest_config['smtp_port'] : 'not set').'
'; +if (isset($rctest_config['smtp_user']) && !empty($rctest_config['smtp_user'])) { + echo 'user: '.$rctest_config['smtp_user'].'
'; +} elseif ($rctest_config['smtp_user'] == '%u') { + echo 'user: use current session
'; +} else { + echo 'user: not set
'; +} +if (isset($rctest_config['smtp_pass']) && !empty($rctest_config['smtp_pass'])) { + echo 'pass: '.$rctest_config['smtp_pass'].'
'; +} elseif (isset($rctest_config['smtp_pass']) && $rctest_config['smtp_pass'] == '%p') { + echo 'pass: use current session
'; +} else { + echo 'pass: not set
'; +} +?>		 +'; +if (isset($rctest_config['default_host']) && is_array($rctest_config['default_host'])) { + echo 'server: '.var_export($rctest_config['default_host'], true).'
'; +} elseif (isset($rctest_config['default_host']) && !empty($rctest_config['default_host'])) { + echo 'server: '.$rctest_config['default_host'].'
'; +} else { + echo 'server: not set
'; +} +echo 'port: '.(isset($rctest_config['default_port']) && !empty($rctest_config['default_port']) ? $rctest_config['default_port'] : 'not set').'
'; +?>

Test SMTP settings - send an email

Don't abuse this!

@@ -426,8 +423,9 @@ endif; ?> Recipient:


- + + + '; echo 'Please edit $rctest_config in ' . basename(__FILE__) . '
'; } else { - - $data = $_POST['smtp_test']; + $data = null; $CONFIG = $rctest_config; + if (isset($_POST['smtp_test'])) { + $data = $_POST['smtp_test']; + + // inject into config array + $CONFIG['smtp_user'] = $data['user']; + $CONFIG['smtp_pass'] = $data['pass']; + } require_once 'lib/rc_mail_mime.inc'; require_once 'include/rcube_smtp.inc'; @@ -451,11 +455,16 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['action'] == 'smtp') { $body = 'This is a test to confirm that RoundCube can send email.'; - $mail_object = new rc_mail_mime(); - $mail_object->headers($headers); + $mail_object = new rc_mail_mime(); + $send_headers = $mail_object->headers($headers); $smtp_response = array(); - if (smtp_mail($rctest_config['from'], $recipients, ($foo = $mail_object->txtHeaders($send_headers)), $body, $smtp_response)) { + + $status = smtp_mail($rctest_config['from'], $recipients, + ($foo = $mail_object->txtHeaders($send_headers)), + $body, $smtp_response); + + if ($status) { echo CHECK_OK . '
'; } else { echo CHECK_NOK; -- cgit v1.2.3