Changeset fb40f37 in github


Ignore:
Timestamp:
Oct 7, 2011 4:43:07 AM (20 months ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.7, release-0.8
Children:
3703021
Parents:
b1f0846
Message:
  • Ignore DSN request when it isn't supported by SMTP server (#1487800)
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    rb1f0846 rfb40f37  
    22=========================== 
    33 
     4- Ignore DSN request when it isn't supported by SMTP server (#1487800) 
    45- Make sure LDAP name fields aren't arrays (#1488108) 
    56- Fixed imap test to non-default port when using ssl (#1488118) 

  • program/include/rcube_smtp.php

    r6d0ada3 rfb40f37  
    215215      $exts = $this->conn->getServiceExtensions(); 
    216216 
    217       if (!isset($exts['DSN'])) { 
    218         $this->error = array('label' => 'smtpdsnerror'); 
    219         $this->response[] = "DSN not supported"; 
    220         return false; 
    221       } 
    222  
    223       $from_params      = 'RET=HDRS'; 
    224       $recipient_params = 'NOTIFY=SUCCESS,FAILURE'; 
     217      if (isset($exts['DSN'])) { 
     218        $from_params      = 'RET=HDRS'; 
     219        $recipient_params = 'NOTIFY=SUCCESS,FAILURE'; 
     220      } 
    225221    } 
    226222 

  • program/localization/en_US/messages.inc

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

  • program/localization/pl_PL/messages.inc

    r32226f73 rfb40f37  
    160160$messages['smtprecipientserror'] = 'BłĠ
    161161d SMTP: Parsowanie listy odbiorców nie powiodło się.'; 
    162 $messages['smtpdsnerror'] = 'BłĠ
    163 d SMTP: Statusy dostarczenia (DSN) nie sÄ 
    164  obsługiwane przez serwer.'; 
    165162$messages['smtperror'] = 'BłĠ
    166163d SMTP: $msg'; 
Note: See TracChangeset for help on using the changeset viewer.