X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FMailer.pm;h=9ef0b085b1e943d5d740e339b8a543df13f5d12d;hb=0fba3edda47fca21bedb14eb88e0f5f8d983bb38;hp=5e280128bdf90d2d5554d7d7c51f8ce434bc5129;hpb=49c7621e7bd48352be257e6ceea0e6fbb1718516;p=kivitendo-erp.git diff --git a/SL/Mailer.pm b/SL/Mailer.pm index 5e280128b..9ef0b085b 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -36,6 +36,8 @@ use SL::Common; use SL::MIME; use SL::Template; +use strict; + my $num_sent = 0; sub new { @@ -112,7 +114,7 @@ sub send { $email =~ s/[^\w\.\-\+=@]//ig; my %temp_form = ( %{ $form }, 'myconfig_email' => $email ); - my $template = PlainTextTemplate->new(undef, \%temp_form, $myconfig); + my $template = SL::Template::create(type => 'PlainText', form => \%temp_form); my $sendmail = $template->parse_block($main::sendmail); if (!open(OUT, $sendmail)) { @@ -184,7 +186,7 @@ $self->{message} my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application"; my $content_type = SL::MIME->mime_type_from_ext($filename); - $content_type = "${application}/${self->{format}}" if (!$content_type && $self->{format}); + $content_type = "${application}/$self->{format}" if (!$content_type && $self->{format}); $content_type ||= 'application/octet-stream'; open(IN, $attachment);