From 0ee20d6f95c136d6ec9bc0dc1e88dd3fbb4ed06b Mon Sep 17 00:00:00 2001 From: tmu Date: Fri, 11 Jun 2004 10:35:22 +0000 Subject: set $main::opt_mimedecodequoted at _print_li_filename(),_format_safe_header() --- fml/lib/Mail/Message/ToHTML.pm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'fml/lib/Mail/Message/ToHTML.pm') diff --git a/fml/lib/Mail/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm index 5684416c..942028a7 100644 --- a/fml/lib/Mail/Message/ToHTML.pm +++ b/fml/lib/Mail/Message/ToHTML.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: ToHTML.pm,v 1.64 2004/02/24 14:36:53 fukachan Exp $ +# $FML: ToHTML.pm,v 1.65 2004/03/24 01:32:04 fukachan Exp $ # package Mail::Message::ToHTML; @@ -17,7 +17,7 @@ my $debug = 0; my $URL = "Mail::Message::ToHTML"; -my $version = q$FML: ToHTML.pm,v 1.64 2004/02/24 14:36:53 fukachan Exp $; +my $version = q$FML: ToHTML.pm,v 1.65 2004/03/24 01:32:04 fukachan Exp $; my $versionid = 0; if ($version =~ /,v\s+([\d\.]+)\s+/) { $versionid = "$1"; @@ -743,6 +743,9 @@ sub _format_safe_header my $hdr = $msg->whole_message_header; my $header_field = \@header_field; + my $mimeopt = $main::opt_mimedecodequoted; + $main::opt_mimedecodequoted = 1; + # header $buf .= "\n"; for my $field (@$header_field) { @@ -769,6 +772,7 @@ sub _format_safe_header } $buf .= "\n"; + $main::opt_mimedecodequoted = $mimeopt; return($buf); } @@ -2026,6 +2030,12 @@ sub _print_li_filename $who .= " " . $db->get('from', $id); } + my $mimeopt = $main::opt_mimedecodequoted; + $main::opt_mimedecodequoted = 1; + $subject = $self->_decode_mime_string($subject) if $subject =~ /=\?/i; + $who = $self->_decode_mime_string($who) if $who =~ /=\?/i; + $main::opt_mimedecodequoted = $mimeopt; + _PRINT_DEBUG("-- print_li_filename id=$id file=$filename"); if (defined $filename && $filename) { -- cgit v1.2.1