diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-25 19:09:13 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-25 19:09:13 +0000 |
| commit | 8df6aa0f23a5138e2a3fe7d3f7fb8951f05a4a7a (patch) | |
| tree | 42e986706b705b5802ebfc9e89a3a9cd4483bd11 /roundcubemail | |
| parent | d68ee90ca60804752b411c3bd73792f1356796ed (diff) | |
- Fix SMTP test in Installer (#1486952)
git-svn-id: https://svn.roundcube.net/trunk@3906 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/installer/test.php | 3 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_smtp.php | 25 |
3 files changed, 13 insertions, 16 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 7a95e66c5..c4f5fc48d 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -7,6 +7,7 @@ CHANGELOG RoundCube Webmail - Fixes in SQL init script + added update script for MSSQL database - Remove redundant date in syslog messages (#1486945) - Fix contacts list page controls when a group is selected (#1486946) +- Fix SMTP test in Installer (#1486952) RELEASE 0.4 ----------- diff --git a/roundcubemail/installer/test.php b/roundcubemail/installer/test.php index a465e2f0b..d1b59794e 100644 --- a/roundcubemail/installer/test.php +++ b/roundcubemail/installer/test.php @@ -276,7 +276,8 @@ if (isset($_POST['sendmail'])) { $send_headers = $mail_object->headers($headers); $SMTP = new rcube_smtp(); - $SMTP->connect(); + $SMTP->connect(rcube_parse_host($RCI->getprop('smtp_server')), + $RCI->getprop('smtp_port'), $CONFIG['smtp_user'], $CONFIG['smtp_pass']); $status = $SMTP->send_mail($headers['From'], $headers['To'], ($foo = $mail_object->txtHeaders($send_headers)), $body); diff --git a/roundcubemail/program/include/rcube_smtp.php b/roundcubemail/program/include/rcube_smtp.php index 3c54d479c..fc32b3f39 100644 --- a/roundcubemail/program/include/rcube_smtp.php +++ b/roundcubemail/program/include/rcube_smtp.php @@ -38,21 +38,16 @@ class rcube_smtp /** - * Object constructor - * - * @param - */ - function __construct() - { - } - - - /** * SMTP Connection and authentication * + * @param string Server host + * @param string Server port + * @param string User name + * @param string Password + * * @return bool Returns true on success, or false on error */ - public function connect() + public function connect($host=null, $port=null, $user=null, $pass=null) { $RCMAIL = rcmail::get_instance(); @@ -64,10 +59,10 @@ class rcube_smtp // let plugins alter smtp connection config $CONFIG = $RCMAIL->plugins->exec_hook('smtp_connect', array( - 'smtp_server' => $RCMAIL->config->get('smtp_server'), - 'smtp_port' => $RCMAIL->config->get('smtp_port', 25), - 'smtp_user' => $RCMAIL->config->get('smtp_user'), - 'smtp_pass' => $RCMAIL->config->get('smtp_pass'), + 'smtp_server' => $host ? $host : $RCMAIL->config->get('smtp_server'), + 'smtp_port' => $port ? $port : $RCMAIL->config->get('smtp_port', 25), + 'smtp_user' => $user ? $user : $RCMAIL->config->get('smtp_user'), + 'smtp_pass' => $pass ? $pass : $RCMAIL->config->get('smtp_pass'), 'smtp_auth_type' => $RCMAIL->config->get('smtp_auth_type'), 'smtp_helo_host' => $RCMAIL->config->get('smtp_helo_host'), 'smtp_timeout' => $RCMAIL->config->get('smtp_timeout'), |