use Email::Address;
use Email::MIME::Creator;
+use Encode;
use File::MimeInfo::Magic;
use File::Slurp;
use List::UtilsBy qw(bundle_by);
+use List::Util qw(sum);
use SL::Common;
use SL::DB::EmailJournal;
use SL::DB::EmailJournalAttachment;
use SL::DB::Employee;
+use SL::Locale::String qw(t8);
use SL::Template;
use SL::Version;
letter => 'letter',
purchase_delivery_order => 'delivery_orders',
sales_delivery_order => 'delivery_orders',
+ dunning => 'dunning',
);
sub new {
next if !$self->{$item};
my @header_addresses;
+ my @addresses = Email::Address->parse($self->{$item});
+
+ # if either no address was parsed or
+ # there are more than 3 characters per parsed email extra, assume the the user has entered bunk
+ if (!@addresses) {
+ die t8('"#1" seems to be a faulty list of email addresses. No addresses could be extracted.',
+ $self->{$item},
+ );
+ } elsif ((length($self->{$item}) - sum map { length $_->original } @addresses) / @addresses > 3) {
+ die t8('"#1" seems to be a faulty list of email addresses. After extracing addresses (#2) too many characters are left.',
+ $self->{$item}, join ', ', map { $_->original } @addresses,
+ );
+ }
- foreach my $addr_obj (Email::Address->parse($self->{$item})) {
+ foreach my $addr_obj (@addresses) {
push @{ $self->{addresses}->{$item} }, $addr_obj->address;
next if $self->{driver}->keep_from_header($item);
my $file_id = 0;
my $email_journal = $::instance_conf->get_email_journal;
- $::lxdebug->message(LXDebug->DEBUG2(), "mail5 att=" . $attachment . " email_journal=" . $email_journal . " id=" . $attachment->{id});
-
if (ref($attachment) eq "HASH") {
$attributes{filename} = $attachment->{name};
$file_id = $attachment->{id} || '0';
$attachment_content ||= ' ';
$attributes{charset} = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
- $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{content_type} . " filename=" . $attributes{filename});
-
my $ent;
if ( $attributes{content_type} eq 'message/rfc822' ) {
$ent = Email::MIME->new($attachment_content);
- $ent->header_str_set('Content-disposition' => 'attachment; filename='.$attributes{filename});
} else {
$ent = Email::MIME->create(
attributes => \%attributes,
);
}
+ # Due to a bug in Email::MIME it's not enough to hand over the encoded file name in the "attributes" hash in the
+ # "create" call. Email::MIME iterates over the keys in the hash, and depending on which key it has already seen during
+ # the iteration it might revert the encoding. As Perl's hash key order is randomized for each Perl run, this means
+ # that the file name stays unencoded sometimes.
+ # Setting the header manually after the "create" call circumvents this problem.
+ $ent->header_set('Content-disposition' => 'attachment; filename="' . encode('MIME-Q', $attributes{filename}) . '"');
+
push @{ $self->{mail_attachments}} , SL::DB::EmailJournalAttachment->new(
name => $attributes{filename},
mime_type => $attributes{content_type},
my @parts;
- push @{ $self->{headers} }, (Type => "multipart/mixed");
-
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} ||= [];
+ push @{ $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;
my $error;
my $ok = eval {
my $email = $self->_create_message;
- #$::lxdebug->message(0, "message: " . $email->as_string);
- # return "boom";
-
- $::lxdebug->message(LXDebug->DEBUG2(), "mail1 from=".$self->{from}." to=".$self->{to});
my $from_obj = (Email::Address->parse($self->{from}))[0];
$self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]);
=head1 OVERVIEW
-Mail can be send from kivitendo via the sendmail command or the smtp protocol.
+Mail can be sent from kivitendo via the sendmail command or the smtp protocol.
=head1 INTERNAL DATA TYPES
=item C<%mail_delivery_modules>
- Currently two modules are supported either smtp or sendmail.
+ Currently two modules are supported: smtp or sendmail.
=item C<%type_to_table>
=item C<send>
- If a mail was send successfully the internal functions _store_in_journal
+ If a mail was sent successfully the internal function _store_in_journal
is called if email journaling is enabled. If _store_in_journal was executed
successfully and the calling form is already persistent (database id) a
record_link will be created.
If $self->{journalentry} and either $self->{record_id} or $::form->{id} (checked in
- this order) exists a record link from record to email journal is created.
+ this order) exist a record link from record to email journal is created.
+ It is possible to provide an array reference with more than one id in
+ $self->{record_id} or $::form->{id}. In this case all records are linked to
+ the mail.
Will fail silently if record_link creation wasn't successful (same behaviour as
_store_in_journal).
projects / kivitendo-erp.git / blobdiff