X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/2ea07c13e111b88478827bf621d41df3eec19dac..8fec2dc1a8d85554b23c6333bac430d6004a6aed:/SL/Mailer.pm diff --git a/SL/Mailer.pm b/SL/Mailer.pm index 67f5fdd2f..dc6002b42 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -121,26 +121,25 @@ sub _create_address_headers { sub _create_attachment_part { my ($self, $attachment) = @_; - my $source_file_name; - my %attributes = ( disposition => 'attachment', encoding => 'base64', ); + my $attachment_content; + if (ref($attachment) eq "HASH") { $attributes{filename} = $attachment->{name}; - $source_file_name = $attachment->{filename}; + $attachment_content = $attachment->{content} // eval { read_file($attachment->{filename}) }; } else { # strip path $attributes{filename} = $attachment; $attributes{filename} =~ s:.*\Q$self->{fileid}\E:: if $self->{fileid}; $attributes{filename} =~ s:.*/::g; - $source_file_name = $attachment; + $attachment_content = eval { read_file($attachment) }; } - my $attachment_content = eval { read_file($source_file_name) }; return undef if !defined $attachment_content; my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? 'text' : 'application';