extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 06:48:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem with broken rfc mailaddress on parsing for activesync

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-15 10:31:08 +00:00
parent f4d4f9600a
commit fb4b2e1478
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_activesync.inc.php
View File

@ -1305,7 +1305,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
// $output->from = $this->messages[$id]['sender_address']; //$stat['FETCHED_HEADER']['sender_name'] // $output->from = $this->messages[$id]['sender_address']; //$stat['FETCHED_HEADER']['sender_name']
//error_log(__METHOD__.__LINE__.' To:'.$headers['TO']); //error_log(__METHOD__.__LINE__.' To:'.$headers['TO']);
$output->to = $headers['TO']; $output->to = $headers['TO'];
error_log(__METHOD__.__LINE__.' From:'.$headers['FROM']); //error_log(__METHOD__.__LINE__.' From:'.$headers['FROM']);
$output->from = $headers['FROM']; $output->from = $headers['FROM'];
$output->cc = ($headers['CC'] ? $headers['CC']:null); $output->cc = ($headers['CC'] ? $headers['CC']:null);
$output->reply_to = ($headers['REPLY_TO']?$headers['REPLY_TO']:null); $output->reply_to = ($headers['REPLY_TO']?$headers['REPLY_TO']:null);

3
mail/inc/class.mail_bo.inc.php
View File

@ -1657,7 +1657,7 @@ class mail_bo
$_string = translation::decodeMailHeader($_string,self::$displayCharset); $_string = translation::decodeMailHeader($_string,self::$displayCharset);
if ($_tryIDNConversion===true && stripos($_string,'@')!==false) if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
{ {
$rfcAddr = imap_rfc822_parse_adrlist($_string,''); $rfcAddr = imap_rfc822_parse_adrlist(str_replace(',','\,',$_string),'');
if (!isset(self::$idna2)) self::$idna2 = new egw_idna; if (!isset(self::$idna2)) self::$idna2 = new egw_idna;
$stringA = array(); $stringA = array();
//$_string = str_replace($rfcAddr[0]->host,self::$idna2->decode($rfcAddr[0]->host),$_string); //$_string = str_replace($rfcAddr[0]->host,self::$idna2->decode($rfcAddr[0]->host),$_string);
@ -4090,6 +4090,7 @@ class mail_bo
} }
} }
$retValue = array_change_key_case($retValue,CASE_UPPER); $retValue = array_change_key_case($retValue,CASE_UPPER);
//error_log(__METHOD__.__LINE__.array2string($retValue));
// if SUBJECT is an array, use thelast one, as we assume something with the unfolding for the subject did not work // if SUBJECT is an array, use thelast one, as we assume something with the unfolding for the subject did not work
if (is_array($retValue['SUBJECT'])) if (is_array($retValue['SUBJECT']))
{ {