patch #591230 from Toshiharu Moriyama

added decodeHeader

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3287 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 6fd617a7daa18002818c94b9113193dcd6634ed0..8396da9c11d439da9c602956742aad9d6beeeb1d 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -91,12 +91,12 @@ function getforwardHeader($orig_header) {
       $display[$key] = $key .': '. str_pad('', $maxsize - $val);
    }      
    $bodyTop =  str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH);
       $display[$key] = $key .': '. str_pad('', $maxsize - $val);
    }      
    $bodyTop =  str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH);

-   $bodyTop .=  "\n". $display[_("Subject")] . $orig_header->subject . "\n" .
-        $display[_("From")] . $orig_header->getAddr_s('from',"\n$indent") . "\n" .
+   $bodyTop .=  "\n". $display[_("Subject")] . decodeHeader($orig_header->subject) . "\n" .
+        $display[_("From")] . decodeHeader($orig_header->getAddr_s('from',"\n$indent")) . "\n" .

         $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
         $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .

-        $display[_("To")] . $orig_header->getAddr_s('to',"\n$indent") ."\n";
+        $display[_("To")] . decodeHeader($orig_header->getAddr_s('to',"\n$indent")) ."\n";

   if ($orig_header->cc != array() && $orig_header->cc !='') {
   if ($orig_header->cc != array() && $orig_header->cc !='') {

-     $bodyTop .= $display[_("Cc")] . $orig_header->getAddr_s('cc',"\n$indent") . "\n";
+     $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n";

   }
   $bodyTop .= str_pad('', $editor_size -2 , '-');
   $bodyTop .= "\n";
   }
   $bodyTop .= str_pad('', $editor_size -2 , '-');
   $bodyTop .= "\n";