class.emailadmin_imapbase.inc.php

leithoff 2016-02-11 13:23:56 UTC #1

Author: leithoff
New Revision: 54987

URL: http://svn.stylite.de/viewvc/egroupware?rev=54987&view=rev
Log:
call decode_header with true on emailadresses in getHeaders to trigger idna conversion to properly display umlaut domains in emailaddresses

Modified:
branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php

Modified: branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=54987&r1=54986&r2=54987&view=diff

— branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php Thu Feb 11 14:23:56 2016
@@ -1552,11 +1552,11 @@
}
//error_log(METHOD.’ (’.LINE.’) ‘.$headerObject[‘SUBJECT’].’->’.array2string($_headerObject->getEnvelope()->__get(‘from’)));
if(is_array($headerObject[‘FROM’]) && $headerObject[‘FROM’][0]) {

  			$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0]);

  			$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
  		}

  		if(is_array($headerObject['TO']) && $headerObject['TO'][0]) {

  			$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0]);

  			$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0],true);
  			if (count($headerObject['TO'])>1)
  			{
  				$ki=0;

@@ -1564,7 +1564,7 @@
{
if ($k==0) continue;
//error_log(METHOD.’ (’.LINE.’) '."-> $k:".array2string($add));

  					$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add);

  					$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add,true);
  					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
  					$ki++;
  				}

@@ -1575,7 +1575,7 @@
foreach($headerObject[‘CC’] as $k => $add)
{
//error_log(METHOD.’ (’.LINE.’) '."-> $k:".array2string($add));

  				$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add);

  				$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add,true);
  				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
  				$ki++;
  			}

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs