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

Missing parts from commit f0656f280f

Browse Source
This commit is contained in:
hadi 2023-08-14 17:35:40 +02:00
parent f0656f280f
commit 7e5f5f960d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/Mail.php
View File

@ -1504,7 +1504,7 @@ class Mail
// Pre-cache the headers we want, 'fetchHeaders' is a label into the cache // Pre-cache the headers we want, 'fetchHeaders' is a label into the cache
$fquery->headers('fetchHeaders',array( $fquery->headers('fetchHeaders',array(
'DISPOSITION-NOTIFICATION-TO','RETURN-RECEIPT-TO','X-CONFIRM-READING-TO', 'DISPOSITION-NOTIFICATION-TO','RETURN-RECEIPT-TO','X-CONFIRM-READING-TO',
'DATE','SUBJECT','FROM','TO','CC','REPLY-TO', 'DATE','SUBJECT','FROM','TO','CC','BCC','REPLY-TO',
'X-PRIORITY' 'X-PRIORITY'
),array( ),array(
// Cache headers, we'll look at them below // Cache headers, we'll look at them below
@ -1599,9 +1599,10 @@ class Mail
$headerObject['FROM'] = (array)($headerForPrio['FROM']?$headerForPrio['FROM']:($headerForPrio['REPLY-TO']?$headerForPrio['REPLY-TO']:$headerForPrio['RETURN-PATH'])); $headerObject['FROM'] = (array)($headerForPrio['FROM']?$headerForPrio['FROM']:($headerForPrio['REPLY-TO']?$headerForPrio['REPLY-TO']:$headerForPrio['RETURN-PATH']));
$headerObject['TO'] = (array)$headerForPrio['TO']; $headerObject['TO'] = (array)$headerForPrio['TO'];
$headerObject['CC'] = isset($headerForPrio['CC'])?(array)$headerForPrio['CC']:array(); $headerObject['CC'] = isset($headerForPrio['CC'])?(array)$headerForPrio['CC']:array();
$headerObject['BCC'] = isset($headerForPrio['BCC'])?(array)$headerForPrio['BCC']:array();
$headerObject['REPLY-TO'] = isset($headerForPrio['REPLY-TO'])?(array)$headerForPrio['REPLY-TO']:array(); $headerObject['REPLY-TO'] = isset($headerForPrio['REPLY-TO'])?(array)$headerForPrio['REPLY-TO']:array();
$headerObject['PRIORITY'] = isset($headerForPrio['X-PRIORITY'])?$headerForPrio['X-PRIORITY']:null; $headerObject['PRIORITY'] = isset($headerForPrio['X-PRIORITY'])?$headerForPrio['X-PRIORITY']:null;
foreach (array('FROM','TO','CC','REPLY-TO') as $key) foreach (array('FROM','TO','CC','BCC','REPLY-TO') as $key)
{ {
$address = array(); $address = array();
foreach ($headerObject[$key] as $k => $ad) foreach ($headerObject[$key] as $k => $ad)
@ -1805,6 +1806,16 @@ class Mail
$ki++; $ki++;
} }
} }
if(!empty($headerObject['BCC'])) {
$ki=0;
foreach($headerObject['BCC'] as $k => $add)
{
//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
$retValue['header'][$sortOrder[$uid]]['bcc_addresses'][$ki] = self::decode_header($add,true);
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
$ki++;
}
}
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]])); //error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]));
$count++; $count++;