diff options
| author | fukachan <fukachan> | 2005-05-30 00:02:30 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2005-05-30 00:02:30 +0000 |
| commit | 0b86e7cacd7d6fc77d902a91a03fb6868cf9a19c (patch) | |
| tree | c6d3d30571e222662f43334923dd9451e4842fa1 | |
| parent | de15b5b9845ae79b0e97ffc0875e100dc08451b5 (diff) | |
| download | fml8-0b86e7cacd7d6fc77d902a91a03fb6868cf9a19c.tar.gz fml8-0b86e7cacd7d6fc77d902a91a03fb6868cf9a19c.tar.bz2 fml8-0b86e7cacd7d6fc77d902a91a03fb6868cf9a19c.zip | |
use Mail::Message::Encode not MIME::Base64.
| -rw-r--r-- | fml/lib/FML/Filter/TextPlain.pm | 10 | ||||
| -rw-r--r-- | fml/lib/Mail/Message/ToHTML.pm | 16 |
2 files changed, 11 insertions, 15 deletions
diff --git a/fml/lib/FML/Filter/TextPlain.pm b/fml/lib/FML/Filter/TextPlain.pm index 57ccfdeb..c6aa8a5e 100644 --- a/fml/lib/FML/Filter/TextPlain.pm +++ b/fml/lib/FML/Filter/TextPlain.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: TextPlain.pm,v 1.11 2004/07/23 12:41:56 fukachan Exp $ +# $FML: TextPlain.pm,v 1.12 2005/05/27 01:47:05 fukachan Exp $ # package FML::Filter::TextPlain; @@ -276,13 +276,13 @@ sub _decode_mime_buffer # cheap diagnostic check return $buf unless $encoding; + use Mail::Message::Encode; + my $encode = new Mail::Message::Encode; if ($encoding eq 'base64') { - use MIME::Base64; - $buf = decode_base64($buf); + $buf = $encode->raw_decode_base64($buf); } elsif ($encoding eq 'quoted-printable') { - use MIME::QuotedPrint; - $buf = decode_qp($buf); + $buf = $encode->raw_decode_qp($buf); } return $buf; diff --git a/fml/lib/Mail/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm index f9dc0978..7f49d650 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.72 2004/11/14 14:14:14 tmu Exp $ +# $FML: ToHTML.pm,v 1.73 2005/05/26 10:23:00 fukachan Exp $ # package Mail::Message::ToHTML; @@ -17,7 +17,7 @@ my $debug = 0; my $URL = "<A HREF=\"http://www.fml.org/software/\">Mail::Message::ToHTML</A>"; -my $version = q$FML: ToHTML.pm,v 1.72 2004/11/14 14:14:14 tmu Exp $; +my $version = q$FML: ToHTML.pm,v 1.73 2005/05/26 10:23:00 fukachan Exp $; my $versionid = 0; if ($version =~ /,v\s+([\d\.]+)\s+/) { $versionid = "$1"; @@ -926,17 +926,13 @@ sub _binary_print $fh->autoflush(1); binmode($fh); + use Mail::Message::Encode; + my $encode = new Mail::Message::Encode; if ($enc eq 'base64') { - eval q{ - use MIME::Base64; - print $fh decode_base64( $msg->message_text() ); - }; + print $fh $encode->raw_decode_base64( $msg->message_text() ); } elsif ($enc eq 'quoted-printable') { - eval q{ - use MIME::QuotedPrint; - print $fh decode_qp( $msg->message_text() ); - }; + print $fh $encode->raw_decode_qp( $msg->message_text() ); } elsif ($enc eq '7bit') { _print_safe_str($fh, $msg->message_text()); |