Bladeren bron

fixed mdn message generation, now it can handle encoded strings (subjects
and to address)

stekkel 22 jaren geleden
bovenliggende
commit
acc6e75fde
1 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 3 3
      src/read_body.php

+ 3 - 3
src/read_body.php

@@ -163,7 +163,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
     }
     }
     $rfc822_header->content_type = $content_type;
     $rfc822_header->content_type = $content_type;
     $rfc822_header->to[] = $header->dnt;
     $rfc822_header->to[] = $header->dnt;
-    $rfc822_header->subject = _("Read:") . ' ' . $header->subject;
+    $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject);
 
 
 
 
     $reply_to = '';
     $reply_to = '';
@@ -200,8 +200,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
     $now = getLongDateString( time() );
     $now = getLongDateString( time() );
     set_my_charset();
     set_my_charset();
     $body = _("Your message") . "\r\n\r\n" .
     $body = _("Your message") . "\r\n\r\n" .
-            "\t" . _("To:") . ' ' . $to . "\r\n" .
-            "\t" . _("Subject:") . ' ' . $header->subject . "\r\n" .
+            "\t" . _("To:") . ' ' . decodeHeader($to) . "\r\n" .
+            "\t" . _("Subject:") . ' ' . decodeHeader($header->subject) . "\r\n" .
             "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
             "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
             "\r\n" .
             "\r\n" .
             sprintf( _("Was displayed on %s"), $now );
             sprintf( _("Was displayed on %s"), $now );