my @attfiles;
# if we send html or plain text inline
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
- $mail->{contenttype} = "text/html";
+ $mail->{content_type} = "text/html";
$mail->{message} =~ s/\r//g;
$mail->{message} =~ s/\n/<br>\n/g;
$full_signature =~ s/\n/<br>\n/g;
if ($self->{message}) {
push @parts, Email::MIME->create(
attributes => {
- content_type => $self->{contenttype},
+ content_type => $self->{content_type},
charset => $self->{charset},
encoding => 'quoted-printable',
},
);
push @{ $self->{headers} }, (
- 'Content-Type' => qq|$self->{contenttype}; charset="$self->{charset}"|,
+ 'Content-Type' => qq|$self->{content_type}; charset="$self->{charset}"|,
);
}
}
# Set defaults & headers
- $self->{charset} = 'UTF-8';
- $self->{contenttype} ||= "text/plain";
- $self->{headers} = [
- Subject => $self->{subject},
- 'Message-ID' => '<' . $self->_create_message_id . '>',
- 'X-Mailer' => "kivitendo " . SL::Version->get_version,
+ $self->{charset} = 'UTF-8';
+ $self->{content_type} ||= "text/plain";
+ $self->{headers} = [
+ Subject => $self->{subject},
+ 'Message-ID' => '<' . $self->_create_message_id . '>',
+ 'X-Mailer' => "kivitendo " . SL::Version->get_version,
];
$self->{mail_attachments} = [];
$self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;