holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mail merge into mail template excluded BCC

Browse Source
This commit is contained in:
nathangray 2018-04-20 12:00:30 -06:00
parent 67a7819795
commit c7d84ff9f0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Mail.php
View File

@ -7011,10 +7011,14 @@ class Mail
// Parse destinations for placeholders // Parse destinations for placeholders
foreach(Mailer::$type2header as $type => $h) foreach(Mailer::$type2header as $type => $h)
{ {
$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset); $header = $mailObject->getHeader(Mailer::$type2header[$type]);
if(is_array($header)) $header = implode(', ',$header);
$mailObject->clearAddresses($type);
$merged = $bo_merge->merge_string($header,$val,$e,'text/plain',array(),self::$displayCharset);
//error_log($type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$merged); //error_log($type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$merged);
$mailObject->addAddress(trim($merged,'"'),'',$type); $mailObject->addAddress(trim($merged,'"'),'',$type);
} }
$mailObject->forceBccHeader();
// No addresses from placeholders? Treat it as just a contact ID // No addresses from placeholders? Treat it as just a contact ID
if (count($mailObject->getAddresses('to',true)) == 0 && if (count($mailObject->getAddresses('to',true)) == 0 &&

1
api/src/Mailer.php
View File

@ -763,6 +763,7 @@ class Mailer extends Horde_Mime_Mail
*/ */
function getHeader($header) function getHeader($header)
{ {
if(strtolower($header) === 'bcc') return $this->bcc->addresses;
return $this->_headers ? $this->_headers->getValue($header) : null; return $this->_headers ? $this->_headers->getValue($header) : null;
} }