X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/e3b0f6130085592e16a5ec4aedf89cd3eaf9a363..975304c772762b6a029c21aab00f3f449ed5cdf5:/SL/Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 59b521834..c8fe0f2a4 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -36,7 +36,6 @@ use SL::DB::Employee;
 use SL::Template;
 
 use strict;
-use Encode;
 
 my $num_sent = 0;
 
@@ -118,7 +117,7 @@ sub _create_address_headers {
         $addr_obj->phrase($phrase);
       }
 
-      push @header_addresses, encode('MIME-Header',$addr_obj->format);
+      push @header_addresses, $addr_obj->format;
     }
 
     push @{ $self->{headers} }, ( ucfirst($item) => join(', ', @header_addresses) ) if @header_addresses;
@@ -140,7 +139,6 @@ sub _create_attachment_part {
   $::lxdebug->message(LXDebug->DEBUG2(), "mail5 att=" . $attachment . " email_journal=" . $email_journal . " id=" . $attachment->{id});
 
   if (ref($attachment) eq "HASH") {
-    $attributes{Path}         = $attachment->{path} || $attachment->{filename};
     $attributes{filename}     = $attachment->{name};
     $file_id                  = $attachment->{id}   || '0';
     $attributes{content_type} = $attachment->{type} || 'application/pdf';
@@ -148,8 +146,6 @@ sub _create_attachment_part {
     $attachment_content       = eval { read_file($attachment->{path}) } if !$attachment_content;
 
   } else {
-    # strip path
-    $attributes{Path}     =  $attachment;
     $attributes{filename} =  $attachment;
     $attributes{filename} =~ s:.*\Q$self->{fileid}\E:: if $self->{fileid};
     $attributes{filename} =~ s:.*/::g;
@@ -164,9 +160,9 @@ sub _create_attachment_part {
   return undef if $email_journal > 1 && !defined $attachment_content;
 
   $attachment_content ||= ' ';
-  $attributes{charset}  = $self->{charset} if $self->{charset};
+  $attributes{charset}  = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
 
-  $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{Type} . " path=" . $attributes{Path} . " filename=" . $attributes{Filename});
+  $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{Type} . " filename=" . $attributes{Filename});
 
   my $ent;
   if ( $attributes{content_type} eq 'message/rfc822' ) {
@@ -233,7 +229,7 @@ sub send {
   $self->{charset}       =  'UTF-8';
   $self->{contenttype} ||=  "text/plain";
   $self->{headers}       =  [
-    Subject              => encode('MIME-Header',$self->{subject}),
+    Subject              => $self->{subject},
     'Message-ID'         => '<' . $self->_create_message_id . '>',
     'X-Mailer'           => "kivitendo $self->{version}",
   ];