X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=234b6a784b77e30cbd048ebf301e4b0ba2ce4f7f;hb=9198a41442e997dc37eb80d3a30eab7136d58208;hp=37d98b7a7d00bf12d705eab256f8c144bcec5082;hpb=3d7797630e04ddb308b11a58cd9732d502029125;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 37d98b7a7..234b6a784 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -30,6 +30,11 @@
 
 package Mailer;
 
+use SL::Common;
+use SL::Template;
+
+my $num_sent = 0;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -87,26 +92,33 @@ sub mime_quote_text {
 sub send {
   $main::lxdebug->enter_sub();
 
-  my ($self, $out) = @_;
+  my ($self) = @_;
 
-  my $boundary = time;
-  $boundary = "LxOffice-$self->{version}-$boundary";
-  my $domain = $self->{from};
-  $domain =~ s/(.*?\@|>)//g;
-  my $msgid = "$boundary\@$domain";
+  local (*IN, *OUT);
 
-  $self->{charset} = "ISO-8859-15" unless $self->{charset};
+  $num_sent++;
+  my $boundary = time() . "-$$-${num_sent}";
+  $boundary    =  "LxOffice-$self->{version}-$boundary";
+  my $domain   =  $self->{from};
+  $domain      =~ s/(.*?\@|>)//g;
+  my $msgid    =  "$boundary\@$domain";
 
-  if ($out) {
-    if (!open(OUT, $out)) {
-      $main::lxdebug->leave_sub();
-      return "$out : $!";
-    }
-  } else {
-    if (!open(OUT, ">-")) {
-      $main::lxdebug->leave_sub();
-      return "STDOUT : $!";
-    }
+  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, $sendmail)) {
+    $main::lxdebug->leave_sub();
+    return "$sendmail : $!";
   }
 
   $self->{contenttype} = "text/plain" unless $self->{contenttype};
@@ -155,7 +167,7 @@ $self->{message}
       } else {
         $filename = $attachment;
         # strip path
-        $filename =~ s/(.*\/|$self->{fileid})//g;
+        $filename =~ s/(.*\/|\Q$self->{fileid}\E)//g;
       }
 
       my $application =