From 572b40b8654ed1a676f026a4c2d65dba01717dcc Mon Sep 17 00:00:00 2001 From: fukachan Date: Fri, 16 May 2003 13:40:57 +0000 Subject: bug fix masking of raw From: address --- fml/lib/Mail/Message/ToHTML.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 91f67bb9..5bbdfd87 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.38 2003/02/20 04:32:51 fukachan Exp $ +# $FML: ToHTML.pm,v 1.39 2003/03/09 03:10:32 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.38 2003/02/20 04:32:51 fukachan Exp $; +my $version = q$FML: ToHTML.pm,v 1.39 2003/03/09 03:10:32 fukachan Exp $; if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = "$URL $1"; } @@ -733,6 +733,12 @@ sub _format_safe_header $buf .= "\n"; my $xbuf = $hdr->get($field); + + # mask the raw address. + if ($field eq 'From') { + $xbuf = $self->_who_of_address($xbuf); + } + $xbuf = $self->_decode_mime_string($xbuf) if $xbuf =~ /=\?iso/i; $buf .= "\n"; $buf .= _sprintf_safe_str($xbuf); @@ -956,7 +962,7 @@ sub cache_message_info # HASH { $id => From: } my $ra = _address_clean_up( $hdr->get('from') ); $db->{ _from }->{ $id } = $ra->[0]; - $db->{ _who }->{ $id } = $self->_who_of_address( $hdr->get('from') ); + $db->{ _who }->{ $id } = $self->_who_of_address( $hdr->get('from') ); # HASH { $id => Message-Id: } # HASH { Message-Id: => $id } -- cgit v1.2.1