X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=4afda6885dee5401f782dc5b87bbad55237a0687;hb=6aeeb993af9ea53703dd60457bf5053cee2afe94;hp=5b793d43a7ab0471d729fad043d260746c1ee0f5;hpb=b161d667d1831bff8111fcec59dcc3a8059607dd;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 5b793d43a..4afda6885 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -25,6 +25,7 @@ package Mailer;
 
 use Email::Address;
 use Email::MIME::Creator;
+use Encode;
 use File::MimeInfo::Magic;
 use File::Slurp;
 use List::UtilsBy qw(bundle_by);
@@ -150,8 +151,6 @@ sub _create_attachment_part {
   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';
@@ -176,12 +175,9 @@ sub _create_attachment_part {
   $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,
@@ -189,6 +185,13 @@ sub _create_attachment_part {
     );
   }
 
+  # 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},
@@ -204,8 +207,6 @@ sub _create_message {
 
   my @parts;
 
-  push @{ $self->{headers} }, (Type => "multipart/mixed");
-
   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {
@@ -245,11 +246,12 @@ sub send {
   # Set defaults & headers
   $self->{charset}        =  'UTF-8';
   $self->{content_type} ||=  "text/plain";
-  $self->{headers}        =  [
+  $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;
 
@@ -261,10 +263,6 @@ sub send {
 
     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 ]);
@@ -368,7 +366,7 @@ SL::Mailer - Base class for sending mails from kivitendo
 
 =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
@@ -378,7 +376,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol.
 
 =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>
 
@@ -410,7 +408,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol.
 
 =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.
@@ -423,7 +421,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol.
 
 
   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.
   Will fail silently if record_link creation wasn't successful (same behaviour as
   _store_in_journal).