[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[32301] trunk/tiki-webmail.php

[<lu...@us...>]

Revision: 32301
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32301&view=rev
Author:   luciash
Date:     2011-01-31 13:33:28 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
[FIX] webmail: display the actual subject (decoded) instead of encoded garbage in list and message read view

Modified Paths:
--------------
    trunk/tiki-webmail.php

Modified: trunk/tiki-webmail.php
===================================================================
--- trunk/tiki-webmail.php	2011-01-31 12:54:00 UTC (rev 32300)
+++ trunk/tiki-webmail.php	2011-01-31 13:33:28 UTC (rev 32301)
@@ -230,7 +230,8 @@
 		}
 		$aux['timestamp'] = strtotime($aux['delivery-date']);
 		
-		$aux['subject'] = isset($aux['subject']) ? utf8_encode($aux['subject']) : '';
+		//$aux['subject'] = isset($aux['subject']) ? utf8_encode($aux['subject']) : '';
+		$aux['subject'] = isset($aux['subject']) ? mb_decode_mimeheader($aux['subject']) : ''; // the commented out line above doesn't work
 		$aux['from']    = isset($aux['from'])    ? utf8_encode($aux['from']) : '';
 		$aux['to']      = isset($aux['to'])      ? utf8_encode($aux['to']) : '';
 		$aux['cc']      = isset($aux['cc'])      ? utf8_encode($aux['cc']) : '';
@@ -450,6 +451,7 @@
 			$aux = $filtered[$i];
 		} else {
 			$aux = $webmail_list[$i-1];
+			$aux['subject'] = mb_decode_mimeheader($aux['subject']); // Lets decode the Subject before going to list it... otherwise it returns garbage for non-ascii subjects
 			$webmaillib->replace_webmail_message($current['accountId'], $user, $aux['realmsgid']);
 			list($aux['isRead'], $aux['isFlagged'], $aux['isReplied']) = $webmaillib->get_mail_flags($current['accountId'], $user, $aux['realmsgid']);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.