|
|
@ -214,15 +214,11 @@ class rcube_smtp
|
|
|
|
if ($opts['dsn']) {
|
|
|
|
if ($opts['dsn']) {
|
|
|
|
$exts = $this->conn->getServiceExtensions();
|
|
|
|
$exts = $this->conn->getServiceExtensions();
|
|
|
|
|
|
|
|
|
|
|
|
if (!isset($exts['DSN'])) {
|
|
|
|
if (isset($exts['DSN'])) {
|
|
|
|
$this->error = array('label' => 'smtpdsnerror');
|
|
|
|
|
|
|
|
$this->response[] = "DSN not supported";
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$from_params = 'RET=HDRS';
|
|
|
|
$from_params = 'RET=HDRS';
|
|
|
|
$recipient_params = 'NOTIFY=SUCCESS,FAILURE';
|
|
|
|
$recipient_params = 'NOTIFY=SUCCESS,FAILURE';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// RFC2298.3: remove envelope sender address
|
|
|
|
// RFC2298.3: remove envelope sender address
|
|
|
|
if (preg_match('/Content-Type: multipart\/report/', $text_headers)
|
|
|
|
if (preg_match('/Content-Type: multipart\/report/', $text_headers)
|
|
|
|