Skip to content

fix for Email::Stuff RT #63560 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattp- wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix for Email::Stuff RT #63560 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33fd4fb
Fixed multipart/alternative MIME nesting with attachments
May 19, 2011
adb7cfb
Fixed: restructured attachment handling
May 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions lib/Email/Stuff.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ sub new {
# mailer => undef,
parts => [],
email => Email::MIME->create(
attributes => { 'charset' => 'utf-8' },
header => [],
parts => [],
),
Expand Down Expand Up @@ -400,7 +401,7 @@ sub attach {

# Determine the slot to put it at
my $slot = scalar @{$self->{parts}};
$slot = 3 if $slot < 3;
$slot = 2 if $slot < 2;

# Create the part in the attachment slot
$self->{parts}->[$slot] = Email::MIME->create(
Expand Down Expand Up @@ -502,28 +503,37 @@ Creates and returns the full L<Email::MIME> object for the email.

sub email {
my $self = shift;
my @parts = $self->parts;
my ($text, $html, @parts) = @{ $self->{parts} };

### Lyle Hopkins, code added to Fix single part, and multipart/alternative problems
if ( scalar( @{ $self->{parts} } ) >= 3 ) {
## multipart/mixed
$self->{email}->parts_set( \@parts );
}
## Check we actually have any parts
elsif ( scalar( @{ $self->{parts} } ) ) {
if ( _INSTANCE($parts[0], 'Email::MIME') && _INSTANCE($parts[1], 'Email::MIME') ) {
## multipart/alternate
$self->{email}->header_set( 'Content-Type' => 'multipart/alternative' );
$self->{email}->parts_set( \@parts );
}
## As @parts is $self->parts without the blanks, we only need check $parts[0]
elsif ( _INSTANCE($parts[0], 'Email::MIME') ) {
## single part text/plain
_transfer_headers( $self->{email}, $parts[0] );
$self->{email} = $parts[0];
}
if ( _INSTANCE($text, 'Email::MIME') && _INSTANCE($html, 'Email::MIME') ) {

# if we have extra parts, nest a multipart/alt inside a multipart/mixed MIME
if (scalar @parts) {

## multipart/alternative with attachments
my $mp_alt = Email::MIME->create(
header => ['Content-Type' => 'multipart/alternative' ],
parts => [ $text, $html ],
);

$self->{email}->parts_set( [ $mp_alt, @parts ] );
} else {

## multipart/alternative
$self->{email}->header_set( 'Content-Type' => 'multipart/alternative' );
$self->{email}->parts_set( [ $text, $html ] );
}
}
## As @parts is $self->parts without the blanks, we only need check $parts[0]
elsif ( _INSTANCE($text, 'Email::MIME') ) {

# note @parts will collapse if empty
$self->{email}->parts_set( [ $text, @parts ] );
}
elsif ( _INSTANCE($html, 'Email::MIME') ) {

$self->{email}->parts_set( [ $html, @parts ] );
}
$self->{email};
}

Expand Down