From fb40f3778412beefd7d5fed510cb3edb32220874 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 7 Oct 2011 08:43:07 +0000
Subject: - Ignore DSN request when it isn't supported by SMTP server
 (#1487800)

---
 program/include/rcube_smtp.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'program/include')

diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 73c30d227..5c2dd92d2 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -214,14 +214,10 @@ class rcube_smtp
     if ($opts['dsn']) {
       $exts = $this->conn->getServiceExtensions();
 
-      if (!isset($exts['DSN'])) {
-        $this->error = array('label' => 'smtpdsnerror');
-        $this->response[] = "DSN not supported";
-        return false;
+      if (isset($exts['DSN'])) {
+        $from_params      = 'RET=HDRS';
+        $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
       }
-
-      $from_params      = 'RET=HDRS';
-      $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
     }
 
     // RFC2298.3: remove envelope sender address
-- 
cgit v1.2.3