Form::quote_html gibt es nicht mehr.

[kivitendo-erp.git] / SL / Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 7b011d4..234b6a7 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -31,6 +31,9 @@
 package Mailer;
 
 use SL::Common;
+use SL::Template;
+
+my $num_sent = 0;
 
 sub new {
   $main::lxdebug->enter_sub();
@@ -93,17 +96,29 @@ sub send {
 
   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;
+
+  $form->{myconfig_email} = $email;
+
+  my $template =  PlainTextTemplate->new(undef, $form, $myconfig);
+  my $sendmail =  $template->parse_block($main::sendmail);
 
   $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
 
-  if (!open(OUT, $main::sendmail)) {
+  if (!open(OUT, $sendmail)) {
     $main::lxdebug->leave_sub();
-    return "$main::sendmail : $!";
+    return "$sendmail : $!";
   }
 
   $self->{contenttype} = "text/plain" unless $self->{contenttype};
@@ -152,7 +167,7 @@ $self->{message}
       } else {
         $filename = $attachment;
         # strip path
-        $filename =~ s/(.*\/|$self->{fileid})//g;
+        $filename =~ s/(.*\/|\Q$self->{fileid}\E)//g;
       }
 
       my $application =