extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle problem on mergeprint when trying to use send to email-addresses of umlautdomains

Browse Source
This commit is contained in:
Klaus Leithoff 2013-01-18 08:47:56 +00:00
parent c7bf681e47
commit ef7a56a639
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5051,7 +5051,7 @@ class felamimail_bo
{ {
$mailObject->ClearReplyTos(); $mailObject->ClearReplyTos();
$activeMailProfile = $this->mailPreferences->getIdentity($this->profileID, true); $activeMailProfile = $this->mailPreferences->getIdentity($this->profileID, true);
$mailObject->AddReplyTo($activeMailProfile->emailAddress,$activeMailProfile->realName); $mailObject->AddReplyTo(self::$idna2->encode($activeMailProfile->emailAddress),$activeMailProfile->realName);
} }
foreach ($SendAndMergeTocontacts as $k => $val) foreach ($SendAndMergeTocontacts as $k => $val)
{ {
@ -5076,7 +5076,7 @@ class felamimail_bo
$mailObject->MessageID = ''; $mailObject->MessageID = '';
$mailObject->ClearAllRecipients(); $mailObject->ClearAllRecipients();
$mailObject->ClearCustomHeaders(); $mailObject->ClearCustomHeaders();
$mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn)); $mailObject->AddAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn));
$mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset); $mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset);
if (!empty($AltBody)) if (!empty($AltBody))
{ {
@ -5146,7 +5146,7 @@ class felamimail_bo
//error_log(__METHOD__.__LINE__.array2string($contact)); //error_log(__METHOD__.__LINE__.array2string($contact));
$email = ($contact['email'] ? $contact['email'] : $contact['email_home']); $email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']); $nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
$mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn)); $mailObject->AddAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn));
} }
$mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset); $mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset);
if (!empty($AltBody)) if (!empty($AltBody))