X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=f242120a964c89ec1593303556a7b49431ff46c4;hb=2a0cbd885790174fa0f212e6661b30362650a42c;hp=c8fe0f2a4c69eab8898865388787eb51b471bcec;hpb=36857857e2c4210c0080974b50e469507dfb912d;p=kivitendo-erp.git diff --git a/SL/Mailer.pm b/SL/Mailer.pm index c8fe0f2a4..f242120a9 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -25,15 +25,19 @@ package Mailer; use Email::Address; use Email::MIME::Creator; +use Encode; use File::MimeInfo::Magic; use File::Slurp; use List::UtilsBy qw(bundle_by); +use List::Util qw(sum); use SL::Common; use SL::DB::EmailJournal; use SL::DB::EmailJournalAttachment; use SL::DB::Employee; +use SL::Locale::String qw(t8); use SL::Template; +use SL::Version; use strict; @@ -44,6 +48,20 @@ my %mail_delivery_modules = ( smtp => 'SL::Mailer::SMTP', ); +my %type_to_table = ( + sales_quotation => 'oe', + request_quotation => 'oe', + sales_order => 'oe', + purchase_order => 'oe', + invoice => 'ar', + credit_note => 'ar', + purchase_invoice => 'ap', + letter => 'letter', + purchase_delivery_order => 'delivery_orders', + sales_delivery_order => 'delivery_orders', + dunning => 'dunning', +); + sub new { my ($type, %params) = @_; my $self = { %params }; @@ -87,7 +105,7 @@ sub _create_message_id { $domain =~ s/.*\@//; $domain =~ s/>.*//; - return "kivitendo-$self->{version}-" . time() . "-${$}-${num_sent}\@$domain"; + return "kivitendo-" . SL::Version->get_version . "-" . time() . "-${$}-${num_sent}\@$domain"; } sub _create_address_headers { @@ -105,8 +123,21 @@ sub _create_address_headers { next if !$self->{$item}; my @header_addresses; + my @addresses = Email::Address->parse($self->{$item}); + + # if either no address was parsed or + # there are more than 3 characters per parsed email extra, assume the the user has entered bunk + if (!@addresses) { + die t8('"#1" seems to be a faulty list of email addresses. No addresses could be extracted.', + $self->{$item}, + ); + } elsif ((length($self->{$item}) - sum map { length $_->original } @addresses) / @addresses > 3) { + die t8('"#1" seems to be a faulty list of email addresses. After extracing addresses (#2) too many characters are left.', + $self->{$item}, join ', ', map { $_->original } @addresses, + ); + } - foreach my $addr_obj (Email::Address->parse($self->{$item})) { + foreach my $addr_obj (@addresses) { push @{ $self->{addresses}->{$item} }, $addr_obj->address; next if $self->{driver}->keep_from_header($item); @@ -136,8 +167,6 @@ sub _create_attachment_part { my $file_id = 0; my $email_journal = $::instance_conf->get_email_journal; - $::lxdebug->message(LXDebug->DEBUG2(), "mail5 att=" . $attachment . " email_journal=" . $email_journal . " id=" . $attachment->{id}); - if (ref($attachment) eq "HASH") { $attributes{filename} = $attachment->{name}; $file_id = $attachment->{id} || '0'; @@ -162,12 +191,9 @@ sub _create_attachment_part { $attachment_content ||= ' '; $attributes{charset} = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/}); - $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{Type} . " filename=" . $attributes{Filename}); - my $ent; if ( $attributes{content_type} eq 'message/rfc822' ) { $ent = Email::MIME->new($attachment_content); - $ent->header_str_set('Content-disposition' => 'attachment; filename='.$attributes{filename}); } else { $ent = Email::MIME->create( attributes => \%attributes, @@ -175,6 +201,13 @@ sub _create_attachment_part { ); } + # Due to a bug in Email::MIME it's not enough to hand over the encoded file name in the "attributes" hash in the + # "create" call. Email::MIME iterates over the keys in the hash, and depending on which key it has already seen during + # the iteration it might revert the encoding. As Perl's hash key order is randomized for each Perl run, this means + # that the file name stays unencoded sometimes. + # Setting the header manually after the "create" call circumvents this problem. + $ent->header_set('Content-disposition' => 'attachment; filename="' . encode('MIME-Q', $attributes{filename}) . '"'); + push @{ $self->{mail_attachments}} , SL::DB::EmailJournalAttachment->new( name => $attributes{filename}, mime_type => $attributes{content_type}, @@ -190,12 +223,10 @@ sub _create_message { my @parts; - push @{ $self->{headers} }, (Type => "multipart/mixed"); - if ($self->{message}) { push @parts, Email::MIME->create( attributes => { - content_type => $self->{contenttype}, + content_type => $self->{content_type}, charset => $self->{charset}, encoding => 'quoted-printable', }, @@ -203,7 +234,7 @@ sub _create_message { ); push @{ $self->{headers} }, ( - 'Content-Type' => qq|$self->{contenttype}; charset="$self->{charset}"|, + 'Content-Type' => qq|$self->{content_type}; charset="$self->{charset}"|, ); } @@ -221,20 +252,23 @@ sub send { # Create driver for delivery method (sendmail/SMTP) $self->{driver} = eval { $self->_create_driver }; if (!$self->{driver}) { - $self->_store_in_journal('failed', 'driver could not be created; check your configuration'); - return "send email : $@"; + my $error = $@; + $self->_store_in_journal('failed', 'driver could not be created; check your configuration & log files'); + $::lxdebug->message(LXDebug::WARN(), "Mailer error during 'send': $error"); + + return $error; } # Set defaults & headers - $self->{charset} = 'UTF-8'; - $self->{contenttype} ||= "text/plain"; - $self->{headers} = [ - Subject => $self->{subject}, - 'Message-ID' => '<' . $self->_create_message_id . '>', - 'X-Mailer' => "kivitendo $self->{version}", - ]; + $self->{charset} = 'UTF-8'; + $self->{content_type} ||= "text/plain"; + $self->{headers} ||= []; + push @{ $self->{headers} }, ( + Subject => $self->{subject}, + 'Message-ID' => '<' . $self->_create_message_id . '>', + 'X-Mailer' => "kivitendo " . SL::Version->get_version, + ); $self->{mail_attachments} = []; - $self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files; my $error; my $ok = eval { @@ -244,9 +278,6 @@ sub send { my $email = $self->_create_message; - #$::lxdebug->message(0, "message: " . $email->as_string); - # return "boom"; - my $from_obj = (Email::Address->parse($self->{from}))[0]; $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]); @@ -258,9 +289,11 @@ sub send { $error = $@ if !$ok; + # create journal and link to record $self->{journalentry} = $self->_store_in_journal; + $self->_create_record_link if $self->{journalentry}; - return $ok ? '' : "send email: $error"; + return $ok ? '' : ($error || "undefined error"); } sub _all_recipients { @@ -298,4 +331,126 @@ sub _store_in_journal { return $jentry->id; } + +sub _create_record_link { + my ($self) = @_; + + # check for custom/overloaded types and ids (form != controller) + my $record_type = $self->{record_type} || $::form->{type}; + my $record_id = $self->{record_id} || $::form->{id}; + + # you may send mails for unsaved objects (no record_id => unlinkable case) + if ($self->{journalentry} && $record_id && exists($type_to_table{$record_type})) { + RecordLinks->create_links( + mode => 'ids', + from_table => $type_to_table{$record_type}, + from_ids => $record_id, + to_table => 'email_journal', + to_id => $self->{journalentry}, + ); + } +} + 1; + + +__END__ + +=pod + +=encoding utf8 + +=head1 NAME + +SL::Mailer - Base class for sending mails from kivitendo + +=head1 SYNOPSIS + + package SL::BackgroundJob::CreatePeriodicInvoices; + + use SL::Mailer; + + my $mail = Mailer->new; + $mail->{from} = $config{periodic_invoices}->{email_from}; + $mail->{to} = $email; + $mail->{subject} = $config{periodic_invoices}->{email_subject}; + $mail->{content_type} = $filename =~ m/.html$/ ? 'text/html' : 'text/plain'; + $mail->{message} = $output; + + $mail->send; + +=head1 OVERVIEW + +Mail can be sent from kivitendo via the sendmail command or the smtp protocol. + + +=head1 INTERNAL DATA TYPES + + +=over 2 + +=item C<%mail_delivery_modules> + + Currently two modules are supported: smtp or sendmail. + +=item C<%type_to_table> + + Due to the lack of a single global mapping for $form->{type}, + type is mapped to the corresponding database table. All types which + implement a mail action are currently mapped and should be mapped. + Type is either the value of the old form or the newer controller + based object type. + +=back + +=head1 FUNCTIONS + +=over 4 + +=item C + +=item C<_create_driver> + +=item C<_cleanup_addresses> + +=item C<_create_address_headers> + +=item C<_create_message_id> + +=item C<_create_attachment_part> + +=item C<_create_message> + +=item C + + If a mail was sent successfully the internal function _store_in_journal + is called if email journaling is enabled. If _store_in_journal was executed + successfully and the calling form is already persistent (database id) a + record_link will be created. + +=item C<_all_recipients> + +=item C<_store_in_journal> + +=item C<_create_record_link $self->{journalentry}, $::form->{id}, $self->{record_id}> + + + If $self->{journalentry} and either $self->{record_id} or $::form->{id} (checked in + this order) exist a record link from record to email journal is created. + It is possible to provide an array reference with more than one id in + $self->{record_id} or $::form->{id}. In this case all records are linked to + the mail. + Will fail silently if record_link creation wasn't successful (same behaviour as + _store_in_journal). + +=item C + +=back + +=head1 BUGS + +Nothing here yet. + +=head1 AUTHOR + +=cut