- Fix SMTP test in Installer (#1486952)

3 files changed, 13 insertions, 16 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7a95e66c5..c4f5fc48d 100644
--- a/CHANGELOG
+++ b/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/installer/test.php b/installer/test.php
index a465e2f0b..d1b59794e 100644
--- a/installer/test.php
+++ b/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/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 3c54d479c..fc32b3f39 100644
--- a/program/include/rcube_smtp.php
+++ b/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'),