extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 17:48:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

finetuning on umlautdomain address handling; while converting to infolog or tracker

Browse Source
This commit is contained in:
Klaus Leithoff 2013-01-17 12:10:03 +00:00
parent dd750f217e
commit 7651204eeb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3475,7 +3475,7 @@ class felamimail_bo
error_log(__METHOD__.__LINE__.array2string($retValue->message));
$retValue = null;
}
return ($decode ? self::decode_header($retValue):$retValue);
return ($decode ? self::decode_header($retValue,true):$retValue);
}
function getMessageRawBody($_uid, $_partID = '')
@ -4676,7 +4676,7 @@ class felamimail_bo
//$p = (string)$addressObject->personal;
$returnAddr .= (strlen($returnAddr)>0?',':'');
//error_log(__METHOD__.__LINE__.$p.' <'.$mb.'@'.$h.'>');
$buff = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
$buff = imap_rfc822_write_address($addressObject->mailbox, self::$idna2->decode($addressObject->host), $addressObject->personal);
$buff = str_replace(array('<','>'),array('[',']'),$buff);
if ($createHTML) $buff = felamimail_bo::htmlspecialchars($buff);
//error_log(__METHOD__.__LINE__.' Address: '.$returnAddr);
@ -4686,6 +4686,7 @@ class felamimail_bo
else
{
// do not mess with strings, return them untouched /* ToDo: validate string as Address */
$rfcAddressArray = self::decode_header($rfcAddressArray,true);
$rfcAddressArray = str_replace(array('<','>'),array('[',']'),$rfcAddressArray);
if (is_string($rfcAddressArray)) return ($createHTML ? felamimail_bo::htmlspecialchars($rfcAddressArray) : $rfcAddressArray);
}