X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FMailer.pm;h=e9665caaccf14b1a1bc894b63e202c31c489c692;hb=0db7873fd959b1c41613efbaaefcbeb7f029e8ba;hp=234b6a784b77e30cbd048ebf301e4b0ba2ce4f7f;hpb=ba36bef4c0fa070e603e89e39daac2f6d2a402d5;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 234b6a784..e9665caac 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -30,6 +30,8 @@
 
 package Mailer;
 
+use Email::Address;
+
 use SL::Common;
 use SL::Template;
 
@@ -55,30 +57,29 @@ sub mime_quote_text {
   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));
 
-    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);
-      $chars_left -= 3;
+      $chars_left -= 3 if (defined $chars_left);
 
     } 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);
-      $chars_left--;
+      $chars_left-- if (defined $chars_left);
     }
   }
 
@@ -97,49 +98,59 @@ sub send {
   local (*IN, *OUT);
 
   $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;
+  my $boundary    = time() . "-$$-${num_sent}";
+  $boundary       =  "LxOffice-$self->{version}-$boundary";
+  my $domain      =  $self->{from};
+  $domain         =~ s/(.*?\@|>)//g;
+  my $msgid       =  "$boundary\@$domain";
 
-  $form->{myconfig_email} = $email;
+  my $form        =  $main::form;
+  my $myconfig    =  \%main::myconfig;
 
-  my $template =  PlainTextTemplate->new(undef, $form, $myconfig);
-  my $sendmail =  $template->parse_block($main::sendmail);
+  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, $sendmail)) {
     $main::lxdebug->leave_sub();
     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)) {
+    next unless ($self->{$item});
     $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)) {
+    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));
+      }
+
+      $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|From: $self->{from}
-To: $self->{to}
-${cc}${bcc}Subject: $subject
-Message-ID: <$msgid>
+  print OUT qq|${headers}Message-ID: <$msgid>
 X-Mailer: Lx-Office $self->{version}
 MIME-Version: 1.0
 |;