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

[mfinanz.git] / SL / Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 7b011d4b0ddb1076454bf36bb949ee57b3a6df95..1cf519b60940551d08ad7dff924f53fde89a41ac 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -30,7 +30,12 @@
 
 package Mailer;
 
 
 package Mailer;
 

+use Email::Address;
+

 use SL::Common;
 use SL::Common;

+use SL::Template;
+
+my $num_sent = 0;

 
 sub new {
   $main::lxdebug->enter_sub();
 
 sub new {
   $main::lxdebug->enter_sub();


@@ -52,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);

     }
   }
 
     }
   }
 


@@ -93,38 +97,60 @@ sub send {
 
   local (*IN, *OUT);
 
 
   local (*IN, *OUT);
 

-  my $boundary = time;
-  $boundary = "LxOffice-$self->{version}-$boundary";
-  my $domain = $self->{from};
-  $domain =~ s/(.*?\@|>)//g;
-  my $msgid = "$boundary\@$domain";
+  $num_sent++;
+  my $boundary    = time() . "-$$-${num_sent}";
+  $boundary       =  "LxOffice-$self->{version}-$boundary";
+  my $domain      =  $self->{from};
+  $domain         =~ s/(.*?\@|>)//g;
+  my $msgid       =  "$boundary\@$domain";
+
+  my $form        =  $main::form;
+  my $myconfig    =  \%main::myconfig;
+
+  my $email       =  $myconfig->{email};
+  $email          =~ s/[^\w\.\-\+=@]//ig;

 
 

-  $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
+  my %temp_form   = ( %{ $form }, 'myconfig_email' => $email );
+  my $template    = PlainTextTemplate->new(undef, \%temp_form, $myconfig);
+  my $sendmail    = $template->parse_block($main::sendmail);

 
 

-  if (!open(OUT, $main::sendmail)) {
+  if (!open(OUT, $sendmail)) {

     $main::lxdebug->leave_sub();
     $main::lxdebug->leave_sub();

-    return "$main::sendmail : $!";
+    return "$sendmail : $!";

   }
 
   }
 

-  $self->{contenttype} = "text/plain" unless $self->{contenttype};
-
-  my ($cc, $bcc);
-  $cc  = "Cc: $self->{cc}\n"   if $self->{cc};
-  $bcc = "Bcc: $self->{bcc}\n" if $self->{bcc};
+  $self->{charset}     ||= Common::DEFAULT_CHARSET;
+  $self->{contenttype} ||= "text/plain";

 
   foreach my $item (qw(to cc bcc)) {
 
   foreach my $item (qw(to cc bcc)) {

+    next unless ($self->{$item});

     $self->{$item} =~ s/\&lt;/</g;
     $self->{$item} =~ s/\$<\$/</g;
     $self->{$item} =~ s/\&gt;/>/g;
     $self->{$item} =~ s/\$>\$/>/g;
   }
 
     $self->{$item} =~ s/\&lt;/</g;
     $self->{$item} =~ s/\$<\$/</g;
     $self->{$item} =~ s/\&gt;/>/g;
     $self->{$item} =~ s/\$>\$/>/g;
   }
 

-  my $subject = $self->mime_quote_text($self->{subject}, 60);
+  my $headers = '';
+  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) {
+      my $phrase = $addr_obj->phrase();
+      if ($phrase) {
+        $phrase =~ s/^\"//;
+        $phrase =~ s/\"$//;
+        $addr_obj->phrase($self->mime_quote_text($phrase));
+      }

 
 

-  print OUT qq|From: $self->{from}
-To: $self->{to}
-${cc}${bcc}Subject: $subject
-Message-ID: <$msgid>
+      $headers .= sprintf("%s: %s\n", ucfirst($item), $addr_obj->format());
+    }
+  }
+
+  $headers .= sprintf("Subject: %s\n", $self->mime_quote_text($self->{subject}, 60));
+
+  print OUT qq|${headers}Message-ID: <$msgid>

 X-Mailer: Lx-Office $self->{version}
 MIME-Version: 1.0
 |;
 X-Mailer: Lx-Office $self->{version}
 MIME-Version: 1.0
 |;


@@ -152,7 +178,7 @@ $self->{message}
       } else {
         $filename = $attachment;
         # strip path
       } else {
         $filename = $attachment;
         # strip path

-        $filename =~ s/(.*\/|$self->{fileid})//g;
+        $filename =~ s/(.*\/|\Q$self->{fileid}\E)//g;

       }
 
       my $application =
       }
 
       my $application =


@@ -168,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|;