- use simple rcube_smtp class

- Installer: fix SMTP settings test

1 files changed, 18 insertions, 0 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 627a8f290..a508e1718 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -35,6 +35,7 @@ class rcmail
   public $config;
   public $user;
   public $db;
+  public $smtp;
   public $imap;
   public $output;
   public $plugins;
@@ -338,6 +339,20 @@ class rcmail
     
     return $this->output;
   }
+
+
+  /**
+   * Create SMTP object and connect to server
+   *
+   * @param boolean True if connection should be established
+   */
+  public function smtp_init($connect = false)
+  {
+    $this->smtp = new rcube_smtp();
+  
+    if ($connect)
+      $this->smtp->connect();
+  }
   
   
   /**
@@ -842,6 +857,9 @@ class rcmail
       $this->imap->write_cache();
     }
 
+    if (is_object($this->smtp))
+      $this->smtp->disconnect();
+
     if (is_object($this->contacts))
       $this->contacts->close();