X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/920fd369e914ad328b0ecd32dba4eb6a982901ed..94e596e55cef6b9ef9b80b5a4dba8204e0c29c9f:/SL/Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 35cc57a75..52691e277 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -30,9 +30,13 @@
 
 package Mailer;
 
+use Email::Address;
+
 use SL::Common;
 use SL::Template;
 
+my $num_sent = 0;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -94,49 +98,56 @@ sub send {
 
   local (*IN, *OUT);
 
-  my $boundary =  time();
-  $boundary    =  "LxOffice-$self->{version}-$boundary";
-  my $domain   =  $self->{from};
-  $domain      =~ s/(.*?\@|>)//g;
-  my $msgid    =  "$boundary\@$domain";
-
-  my $form     =  $main::form;
-  my $myconfig =  \%main::myconfig;
+  $num_sent++;
+  my $boundary    = time() . "-$$-${num_sent}";
+  $boundary       =  "LxOffice-$self->{version}-$boundary";
+  my $domain      =  $self->{from};
+  $domain         =~ s/(.*?\@|>)//g;
+  my $msgid       =  "$boundary\@$domain";
 
-  my $email    =  $myconfig->{email};
-  $email       =~ s/[^\w\.\-\+=@]//ig;
+  my $form        =  $main::form;
+  my $myconfig    =  \%main::myconfig;
 
-  $form->{myconfig_email} = $email;
+  my $email       =  $myconfig->{email};
+  $email          =~ s/[^\w\.\-\+=@]//ig;
 
-  my $template =  PlainTextTemplate->new(undef, $form, $myconfig);
-  my $sendmail =  $template->parse_block($main::sendmail);
-
-  $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) {
+      $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());
+
+      $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
 |;