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

* eMail/merge: allow to replace reply-to adresses with senders own active address when special address ->replace@import@action<- is used within the email-template

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-05 13:38:57 +00:00
parent 76f1f1ab23
commit 411bc98d9d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4919,6 +4919,15 @@ class felamimail_bo
//error_log(__METHOD__.__LINE__.' BodyContentType:'.$mailObject->BodyContentType);
$AltBody = $mailObject->AltBody;
//error_log(__METHOD__.__LINE__.' AltBody:'.$AltBody);
//error_log(__METHOD__.__LINE__.array2string($mailObject->GetReplyTo()));
// Fetch ReplyTo - Address if existing to check if we are to replace it
$replyTo = $mailObject->GetReplyTo();
if (isset($replyTo['replace@import.action']))
{
$mailObject->ClearReplyTos();
$activeMailProfile = $this->mailPreferences->getIdentity($this->profileID, true);
$mailObject->AddReplyTo($activeMailProfile->emailAddress,$activeMailProfile->realName);
}
foreach ($SendAndMergeTocontacts as $k => $val)
{
$sendOK = $openComposeWindow = $openAsDraft = false;
@ -5230,8 +5239,9 @@ class felamimail_bo
if ($key=='reply-to')
{
$myReplyTo = ${$key};
//break; // break early as we add that later
}
$Header .= $mailObject->TextLine(trim($mailObject->AddrAppend($key,${$key})));
$Header .= $mailObject->TextLine(trim($mailObject->AddrAppend(ucfirst($key),${$key})));
break;
case 'content-transfer-encoding':
$mailObject->Encoding = $val;