Charset nur bei Type 'text' Anhängen setzen.

[mfinanz.git] / SL / Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 52691e277f75f208c1d51ce68e087759194694f9..1cf519b60940551d08ad7dff924f53fde89a41ac 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -57,30 +57,29 @@ sub mime_quote_text {
   my $l_start = length($q_start);
 
   my $new_text = "$q_start";
   my $l_start = length($q_start);
 
   my $new_text = "$q_start";

-  $chars_left -= $l_start;
+  $chars_left -= $l_start if (defined $chars_left);

 
   for (my $i = 0; $i < length($text); $i++) {
     my $char = ord(substr($text, $i, 1));
 
 
   for (my $i = 0; $i < length($text); $i++) {
     my $char = ord(substr($text, $i, 1));
 

-    if (($char < 32) || ($char > 127) ||
-        ($char == ord('?')) || ($char == ord('_'))) {
-      if ($chars_left < 5) {
+    if (($char < 32) || ($char > 127) || ($char == ord('?')) || ($char == ord('_'))) {
+      if ((defined $chars_left) && ($chars_left < 5)) {

         $new_text .= "?=\n $q_start";
         $chars_left = 75 - $l_start;
       }
 
       $new_text .= sprintf("=%02X", $char);
         $new_text .= "?=\n $q_start";
         $chars_left = 75 - $l_start;
       }
 
       $new_text .= sprintf("=%02X", $char);

-      $chars_left -= 3;
+      $chars_left -= 3 if (defined $chars_left);

 
     } else {
       $char = ord('_') if ($char == ord(' '));
 
     } else {
       $char = ord('_') if ($char == ord(' '));

-      if ($chars_left < 5) {
+      if ((defined $chars_left) && ($chars_left < 5)) {

         $new_text .= "?=\n $q_start";
         $chars_left = 75 - $l_start;
       }
 
       $new_text .= chr($char);
         $new_text .= "?=\n $q_start";
         $chars_left = 75 - $l_start;
       }
 
       $new_text .= chr($char);

-      $chars_left--;
+      $chars_left-- if (defined $chars_left);

     }
   }
 
     }
   }
 


@@ -132,14 +131,18 @@ sub send {
   }
 
   my $headers = '';
   }
 
   my $headers = '';

-  foreach my $item (qw(from to cc)) {
+  foreach my $item (qw(from to cc bcc)) {

     next unless ($self->{$item});
     my (@addr_objects) = Email::Address->parse($self->{$item});
     next unless (scalar @addr_objects);
 
     foreach my $addr_obj (@addr_objects) {
     next unless ($self->{$item});
     my (@addr_objects) = Email::Address->parse($self->{$item});
     next unless (scalar @addr_objects);
 
     foreach my $addr_obj (@addr_objects) {

-      $addr_obj->phrase($self->mime_quote_text($addr_obj->phrase(), 60))   if ($addr_obj->phrase());
-      $addr_obj->comment($self->mime_quote_text($addr_obj->comment(), 60)) if ($addr_obj->comment());
+      my $phrase = $addr_obj->phrase();
+      if ($phrase) {
+        $phrase =~ s/^\"//;
+        $phrase =~ s/\"$//;
+        $addr_obj->phrase($self->mime_quote_text($phrase));
+      }

 
       $headers .= sprintf("%s: %s\n", ucfirst($item), $addr_obj->format());
     }
 
       $headers .= sprintf("%s: %s\n", ucfirst($item), $addr_obj->format());
     }


@@ -191,7 +194,15 @@ $self->{message}
       }
 
       print OUT qq|--${boundary}
       }
 
       print OUT qq|--${boundary}

-Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
+Content-Type: $application/$self->{format}; name="$filename"; |;
+
+      # only set charset for attachements of type text. every other type should not have this field
+      # refer to bug 883 for detailed information
+      if ($application eq 'text' && $self->{charset}) {
+        print OUT qq|charset="$self->{charset}" |;
+      }
+
+      print OUT qq|

 Content-Transfer-Encoding: BASE64
 Content-Disposition: attachment; filename="$filename"\n\n|;
 
 Content-Transfer-Encoding: BASE64
 Content-Disposition: attachment; filename="$filename"\n\n|;