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

* email: fix bug in MailMerge; Mail-Templates with text/html only were not processed as text/html but as text/plain; now this is handeled correctly/as expected

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-16 13:20:46 +00:00
parent e04a1d8519
commit 90f86b3504
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4282,8 +4282,19 @@ class felamimail_bo
$mailObject->ClearCustomHeaders(); $mailObject->ClearCustomHeaders();
$mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn)); $mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn));
$mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain'); $mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain');
if (!empty($AltBody)) $mailObject->IsHTML(true); if (!empty($AltBody))
else $mailObject->IsHTML(false); {
$mailObject->IsHTML(true);
}
elseif (empty($AltBody) && $mailObject->BodyContentType=='text/html')
{
$mailObject->IsHTML(true);
$AltBody = self::convertHTMLToText($Body,false,$stripalltags=true);
}
else
{
$mailObject->IsHTML(false);
}
//error_log(__METHOD__.__LINE__.' ContentType:'.$mailObject->BodyContentType); //error_log(__METHOD__.__LINE__.' ContentType:'.$mailObject->BodyContentType);
if (!empty($Body)) $mailObject->Body = $bo_merge->merge_string($Body, $val, $e, $mailObject->BodyContentType); if (!empty($Body)) $mailObject->Body = $bo_merge->merge_string($Body, $val, $e, $mailObject->BodyContentType);
//error_log(__METHOD__.__LINE__.' Result:'.$mailObject->Body.' error:'.array2string($e)); //error_log(__METHOD__.__LINE__.' Result:'.$mailObject->Body.' error:'.array2string($e));
@ -4342,8 +4353,19 @@ class felamimail_bo
$mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn)); $mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn));
} }
$mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain'); $mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain');
if (!empty($AltBody)) $mailObject->IsHTML(true); if (!empty($AltBody))
else $mailObject->IsHTML(false); {
$mailObject->IsHTML(true);
}
elseif (empty($AltBody) && $mailObject->BodyContentType=='text/html')
{
$mailObject->IsHTML(true);
$AltBody = self::convertHTMLToText($Body,false,$stripalltags=true);
}
else
{
$mailObject->IsHTML(false);
}
//error_log(__METHOD__.__LINE__.' ContentType:'.$mailObject->BodyContentType); //error_log(__METHOD__.__LINE__.' ContentType:'.$mailObject->BodyContentType);
if (!empty($Body)) $mailObject->Body = $bo_merge->merge_string($Body, $val, $e, $mailObject->BodyContentType); if (!empty($Body)) $mailObject->Body = $bo_merge->merge_string($Body, $val, $e, $mailObject->BodyContentType);
//error_log(__METHOD__.__LINE__.' Result:'.$mailObject->Body.' error:'.array2string($e)); //error_log(__METHOD__.__LINE__.' Result:'.$mailObject->Body.' error:'.array2string($e));