extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 11:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle to address in MDNSent correctly, when a full rfc822 Address is given

Browse Source
This commit is contained in:
Klaus Leithoff 2010-09-15 10:50:41 +00:00
parent 5a9d1833f4
commit b3bdd87c6d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
felamimail/inc/class.bofelamimail.inc.php
View File

@ -2962,7 +2962,7 @@
if ( preg_match('/\b'.$identity->emailAddress.'\b/',$headers['TO']) ) {
$send->From = $identity->emailAddress;
$send->FromName = $identity->realName;
error_log('using identity for send from:'.$send->From.' to match header information:'.$headers['TO']);
error_log(__METHOD__.__LINE__.' using identity for send from:'.$send->From.' to match header information:'.$headers['TO']);
break;
}
if($identity->default) {
@ -2972,13 +2972,15 @@
}
if (isset($headers['DISPOSITION-NOTIFICATION-TO'])) {
$send->AddAddress( $headers['DISPOSITION-NOTIFICATION-TO'] );
$toAddr = $headers['DISPOSITION-NOTIFICATION-TO'];
} else if ( isset($headers['RETURN-RECEIPT-TO']) ) {
$send->AddAddress( $headers['RETURN-RECEIPT-TO']);
$toAddr = $headers['RETURN-RECEIPT-TO'];
} else if ( isset($headers['X-CONFIRM-READING-TO']) ) {
$send->AddAddress( $headers['X-CONFIRM-READING-TO']);
$toAddr = $headers['X-CONFIRM-READING-TO'];
} else return false;
$singleAddress = imap_rfc822_parse_adrlist($toAddr,'');
if (self::$debug) error_log(__METHOD__.__LINE__.' To Address:'.$singleAddress[0]->mailbox."@".$singleAddress[0]->host.", ".$singleAddress[0]->personal);
$send->AddAddress($singleAddress[0]->mailbox."@".$singleAddress[0]->host, $singleAddress[0]->personal);
$send->AddCustomHeader('References: '.$headers['MESSAGE-ID']);
$send->Subject = $send->encode_subject( lang('Read')." : ".$headers['SUBJECT'] );