From 67ede3272b06ea9efcd303644d20887d54871277 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Tue, 24 May 2022 08:26:45 +0000 Subject: [PATCH] Fix PHP notice when property doesn't exist git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14965 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver_SMTP.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php index 90075ccb..6029acb6 100644 --- a/class/deliver/Deliver_SMTP.class.php +++ b/class/deliver/Deliver_SMTP.class.php @@ -347,7 +347,8 @@ class Deliver_SMTP extends Deliver { if (!$to[$i]->host) $to[$i]->host = $domain; if (strlen($to[$i]->mailbox)) { // Ask for DSN if user has requested such and remote server supports it - if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) { + if (isset($rfc822_header->dsn) && $rfc822_header->dsn + && array_key_exists('DSN',$this->ehlo)) { // TODO: Make the DSN parameters configurable by admin? user? fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n"); // Retry without DSN fields for cranky MTAs @@ -368,7 +369,8 @@ class Deliver_SMTP extends Deliver { if (!$cc[$i]->host) $cc[$i]->host = $domain; if (strlen($cc[$i]->mailbox)) { // Ask for DSN if user has requested such and remote server supports it - if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) { + if (isset($rfc822_header->dsn) && $rfc822_header->dsn + && array_key_exists('DSN',$this->ehlo)) { // TODO: Make the DSN parameters configurable by admin? user? fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n"); // Retry without DSN fields for cranky MTAs @@ -389,7 +391,8 @@ class Deliver_SMTP extends Deliver { if (!$bcc[$i]->host) $bcc[$i]->host = $domain; if (strlen($bcc[$i]->mailbox)) { // Ask for DSN if user has requested such and remote server supports it - if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) { + if (isset($rfc822_header->dsn) && $rfc822_header->dsn + && array_key_exists('DSN',$this->ehlo)) { // TODO: Make the DSN parameters configurable by admin? user? fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n"); // Retry without DSN fields for cranky MTAs -- 2.25.1