oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

encode all parts of sent mail properly

Browse source
This commit is contained in:
Graham Knop 2008-06-25 20:02:46 +00:00
parent 1c72108080
commit 1b8567abb2
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/WebGUI/Mail/Send.pm
View file

@ -19,10 +19,10 @@ use LWP::MediaTypes qw(guess_media_type);
use MIME::Entity; use MIME::Entity;
use MIME::Parser; use MIME::Parser;
use Net::SMTP; use Net::SMTP;
use Text::Wrap;
use WebGUI::Group; use WebGUI::Group;
use WebGUI::Macro; use WebGUI::Macro;
use WebGUI::User; use WebGUI::User;
use Encode qw(encode);
=head1 NAME =head1 NAME
@ -167,14 +167,10 @@ sub addHtmlRaw {
my $self = shift; my $self = shift;
my $text = shift; my $text = shift;
# Wrap text after 78 characters
local $Text::Wrap::columns = 78;
# Do not break up words
local $Text::Wrap::huge = "overflow";
$self->getMimeEntity->attach( $self->getMimeEntity->attach(
Charset => "UTF-8", Charset => "UTF-8",
Data => wrap( '', '', $text ), Encoding => "quoted-printable",
Data => encode('utf8', $text ),
Type => "text/html", Type => "text/html",
); );
@ -197,15 +193,12 @@ A string of text.
sub addText { sub addText {
my $self = shift; my $self = shift;
my $text = shift; my $text = shift;
# Wrap text after 78 characters
local $Text::Wrap::columns = 78;
# Do not break up words
local $Text::Wrap::huge = "overflow";
$self->getMimeEntity->attach( $self->getMimeEntity->attach(
Charset => "UTF-8", Charset => "UTF-8",
Data => wrap( '', '', $text ), Encoding => "quoted-printable",
Data => encode('utf8', $text ),
Type => 'text/plain',
); );
return undef; return undef;
@ -315,7 +308,7 @@ sub create {
Bcc=>$headers->{bcc}, Bcc=>$headers->{bcc},
"Reply-To"=>$replyTo, "Reply-To"=>$replyTo,
"In-Reply-To"=>$headers->{inReplyTo}, "In-Reply-To"=>$headers->{inReplyTo},
Subject=>$headers->{subject}, Subject=> encode('MIME-Q', $headers->{subject}),
"Message-Id"=>$id, "Message-Id"=>$id,
Date=>$session->datetime->epochToMail, Date=>$session->datetime->epochToMail,
"X-Mailer"=>"WebGUI" "X-Mailer"=>"WebGUI"