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

Api - Better way to clear recipients between merges that doesn't loose the placeholder

Browse Source
This commit is contained in:
nathangray 2018-06-18 10:26:49 -06:00
parent 78b710450a
commit 56952c1439
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/Mail.php
View File

@ -6934,11 +6934,19 @@ class Mail
$mailObject->addReplyTo(Horde_Idna::encode($activeMailProfile['ident_email']),Mail::generateIdentityString($activeMailProfile,false)); $mailObject->addReplyTo(Horde_Idna::encode($activeMailProfile['ident_email']),Mail::generateIdentityString($activeMailProfile,false));
} }
if(count($SendAndMergeTocontacts) > 1)
{
foreach(Mailer::$type2header as $type => $h)
{
$header = $mailObject->getHeader(Mailer::$type2header[$type]);
if(is_array($header)) $header = implode(', ',$header);
$headers[$type] = $header;
}
}
foreach ($SendAndMergeTocontacts as $k => $val) foreach ($SendAndMergeTocontacts as $k => $val)
{ {
$errorInfo = $email = ''; $errorInfo = $email = '';
$sendOK = $openComposeWindow = $openAsDraft = null; $sendOK = $openComposeWindow = $openAsDraft = null;
$mailObject->clearAllRecipients();
//error_log(__METHOD__.' ('.__LINE__.') '.' Id To Merge:'.$val); //error_log(__METHOD__.' ('.__LINE__.') '.' Id To Merge:'.$val);
if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/ if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
count($SendAndMergeTocontacts) > 1 && $val && count($SendAndMergeTocontacts) > 1 && $val &&
@ -6950,7 +6958,8 @@ class Mail
foreach(Mailer::$type2header as $type => $h) foreach(Mailer::$type2header as $type => $h)
{ {
//error_log('ID ' . $val . ' ' .$type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset)); //error_log('ID ' . $val . ' ' .$type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset));
$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset); $merged = $bo_merge->merge_string($headers[$type],$val,$e,'text/plain',array(),self::$displayCharset);
$mailObject->clearAddresses($type);
$mailObject->addAddress($merged,'',$type); $mailObject->addAddress($merged,'',$type);
if($type == 'to') if($type == 'to')
{ {