From: <pdo...@us...> - 2022-05-24 08:26:47
|
Revision: 14965 http://sourceforge.net/p/squirrelmail/code/14965 Author: pdontthink Date: 2022-05-24 08:26:45 +0000 (Tue, 24 May 2022) Log Message: ----------- Fix PHP notice when property doesn't exist Modified Paths: -------------- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php Modified: trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php =================================================================== --- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2022-05-24 04:43:39 UTC (rev 14964) +++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php 2022-05-24 08:26:45 UTC (rev 14965) @@ -347,7 +347,8 @@ 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 @@ 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 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |