Changeset 5319 in subversion

Timestamp:

Oct 7, 2011 4:43:07 AM (20 months ago)

Author:

alec

Message:

• Ignore DSN request when it isn't supported by SMTP server (#1487800)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_smtp.php (modified) (1 diff)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/localization/pl_PL/messages.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Ignore DSN request when it isn't supported by SMTP server (#1487800)
 - Make sure LDAP name fields aren't arrays (#1488108)
 - Fixed imap test to non-default port when using ssl (#1488118)

trunk/roundcubemail/program/include/rcube_smtp.php

@@ -215 +215 @@
       $exts = $this->conn->getServiceExtensions();
 
-      if (!isset($exts['DSN'])) {
-        $this->error = array('label' => 'smtpdsnerror');
-        $this->response[] = "DSN not supported";
-        return false;
-      }
-
-      $from_params      = 'RET=HDRS';
-      $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
+      if (isset($exts['DSN'])) {
+        $from_params      = 'RET=HDRS';
+        $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
+      }
     }
 

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -129 +129 @@
 $messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtpdsnerror'] = 'SMTP Error: No support for Delivery Status Notifications.';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Invalid e-mail address: $email';

trunk/roundcubemail/program/localization/pl_PL/messages.inc

@@ -160 +160 @@
 $messages['smtprecipientserror'] = 'BłÄ
 d SMTP: Parsowanie listy odbiorców nie powiodło się.';
-$messages['smtpdsnerror'] = 'BłÄ
-d SMTP: Statusy dostarczenia (DSN) nie sÄ
- obsługiwane przez serwer.';
 $messages['smtperror'] = 'BłÄ
 d SMTP: $msg';