- Fix SMTP test in Installer (#1486952)

release-0.6
alecpl 14 years ago
parent 70cfb42839
commit d1dd13ee5c

@ -7,6 +7,7 @@ CHANGELOG RoundCube Webmail
- Fixes in SQL init script + added update script for MSSQL database - Fixes in SQL init script + added update script for MSSQL database
- Remove redundant date in syslog messages (#1486945) - Remove redundant date in syslog messages (#1486945)
- Fix contacts list page controls when a group is selected (#1486946) - Fix contacts list page controls when a group is selected (#1486946)
- Fix SMTP test in Installer (#1486952)
RELEASE 0.4 RELEASE 0.4
----------- -----------

@ -276,7 +276,8 @@ if (isset($_POST['sendmail'])) {
$send_headers = $mail_object->headers($headers); $send_headers = $mail_object->headers($headers);
$SMTP = new rcube_smtp(); $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'], $status = $SMTP->send_mail($headers['From'], $headers['To'],
($foo = $mail_object->txtHeaders($send_headers)), $body); ($foo = $mail_object->txtHeaders($send_headers)), $body);

@ -37,22 +37,17 @@ class rcube_smtp
private $error; private $error;
/**
* Object constructor
*
* @param
*/
function __construct()
{
}
/** /**
* SMTP Connection and authentication * 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 * @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(); $RCMAIL = rcmail::get_instance();
@ -64,10 +59,10 @@ class rcube_smtp
// let plugins alter smtp connection config // let plugins alter smtp connection config
$CONFIG = $RCMAIL->plugins->exec_hook('smtp_connect', array( $CONFIG = $RCMAIL->plugins->exec_hook('smtp_connect', array(
'smtp_server' => $RCMAIL->config->get('smtp_server'), 'smtp_server' => $host ? $host : $RCMAIL->config->get('smtp_server'),
'smtp_port' => $RCMAIL->config->get('smtp_port', 25), 'smtp_port' => $port ? $port : $RCMAIL->config->get('smtp_port', 25),
'smtp_user' => $RCMAIL->config->get('smtp_user'), 'smtp_user' => $user ? $user : $RCMAIL->config->get('smtp_user'),
'smtp_pass' => $RCMAIL->config->get('smtp_pass'), 'smtp_pass' => $pass ? $pass : $RCMAIL->config->get('smtp_pass'),
'smtp_auth_type' => $RCMAIL->config->get('smtp_auth_type'), 'smtp_auth_type' => $RCMAIL->config->get('smtp_auth_type'),
'smtp_helo_host' => $RCMAIL->config->get('smtp_helo_host'), 'smtp_helo_host' => $RCMAIL->config->get('smtp_helo_host'),
'smtp_timeout' => $RCMAIL->config->get('smtp_timeout'), 'smtp_timeout' => $RCMAIL->config->get('smtp_timeout'),

Loading…
Cancel
Save