X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=5e280128bdf90d2d5554d7d7c51f8ce434bc5129;hb=602e46bca5192e4df0d2fa9d3564f61a8f82496c;hp=2cd3b437439d436e14b707af6ae81ea85fc0ac72;hpb=38c19bfdc392dc369d77d612620fccc595a5f2af;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 2cd3b4374..5e280128b 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -33,6 +33,7 @@ package Mailer;
 use Email::Address;
 
 use SL::Common;
+use SL::MIME;
 use SL::Template;
 
 my $num_sent = 0;
@@ -181,10 +182,10 @@ $self->{message}
         $filename =~ s/(.*\/|\Q$self->{fileid}\E)//g;
       }
 
-      my $application =
-        ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
-        ? "text"
-        : "application";
+      my $application    = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application";
+      my $content_type   = SL::MIME->mime_type_from_ext($filename);
+      $content_type      = "${application}/${self->{format}}" if (!$content_type && $self->{format});
+      $content_type    ||= 'application/octet-stream';
 
       open(IN, $attachment);
       if ($?) {
@@ -193,8 +194,15 @@ $self->{message}
         return "$attachment : $!";
       }
 
+      # only set charset for attachements of type text. every other type should not have this field
+      # refer to bug 883 for detailed information
+      my $attachment_charset;
+      if (lc $application eq 'text' && $self->{charset}) {
+        $attachment_charset = qq|; charset="$self->{charset}" |;
+      }
+
       print OUT qq|--${boundary}
-Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
+Content-Type: ${content_type}; name="$filename"$attachment_charset
 Content-Transfer-Encoding: BASE64
 Content-Disposition: attachment; filename="$filename"\n\n|;