X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=6536850581a0b611669c39c8e5e697a5b1a799c1;hb=3a7079558f44e4b80670327e70b565c8caf52a0e;hp=2857e1c755b7882b730ef2d20aa3ef0f94f44584;hpb=8a40e3dd0f638557b8c666fe708ccbc1ac709c4e;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 2857e1c75..653685058 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -25,8 +25,12 @@ package Mailer;
 use Email::Address;
 use Email::MIME::Creator;
 use File::Slurp;
+use List::UtilsBy qw(bundle_by);
 
 use SL::Common;
+use SL::DB::EmailJournal;
+use SL::DB::EmailJournalAttachment;
+use SL::DB::Employee;
 use SL::MIME;
 use SL::Template;
 
@@ -83,16 +87,23 @@ sub _create_message_id {
 sub _create_address_headers {
   my ($self) = @_;
 
+  # $self->{addresses} collects the recipients for use in e.g. the
+  # SMTP 'RCPT TO:' envelope command. $self->{headers} collects the
+  # headers that make up the actual email. 'BCC' should not be
+  # included there for certain transportation methods (SMTP).
+
   $self->{addresses} = {};
 
   foreach my $item (qw(from to cc bcc)) {
     $self->{addresses}->{$item} = [];
-    next if !$self->{$item} || $self->{driver}->keep_from_header($item);
+    next if !$self->{$item};
 
     my @header_addresses;
 
     foreach my $addr_obj (Email::Address->parse($self->{$item})) {
       push @{ $self->{addresses}->{$item} }, $addr_obj->address;
+      next if $self->{driver}->keep_from_header($item);
+
       my $phrase = $addr_obj->phrase();
       if ($phrase) {
         $phrase =~ s/^\"//;
@@ -110,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';
@@ -178,33 +188,90 @@ sub send {
   # Create driver for delivery method (sendmail/SMTP)
   $self->{driver} = eval { $self->_create_driver };
   if (!$self->{driver}) {
-    $::lxdebug->leave_sub();
+    $self->_store_in_journal('failed', 'driver could not be created; check your configuration');
     return "send email : $@";
   }
 
   # Set defaults & headers
-  $self->{charset}     ||=  Common::DEFAULT_CHARSET;
+  $self->{charset}       =  'UTF-8';
   $self->{contenttype} ||=  "text/plain";
   $self->{headers}       =  [
     Subject              => $self->{subject},
-    'Message-ID'         => $self->_create_message_id,
+    'Message-ID'         => '<' . $self->_create_message_id . '>',
     'X-Mailer'           => "kivitendo $self->{version}",
   ];
 
-  # Clean up To/Cc/Bcc address fields
-  $self->_cleanup_addresses;
-  $self->_create_address_headers;
+  my $error;
+  my $ok = eval {
+    # Clean up To/Cc/Bcc address fields
+    $self->_cleanup_addresses;
+    $self->_create_address_headers;
+
+    my $email = $self->_create_message;
 
-  my $email = $self->_create_message;
+    # $::lxdebug->message(0, "message: " . $email->as_string);
+    # return "boom";
 
-  # $::lxdebug->message(0, "message: " . $email->as_string);
-  # return "boom";
+    $self->{driver}->start_mail(from => $self->{from}, to => [ $self->_all_recipients ]);
+    $self->{driver}->print($email->as_string);
+    $self->{driver}->send;
 
-  $self->{driver}->start_mail(from => $self->{from}, to => [ map { @{ $self->{addresses}->{$_} } } qw(to cc bcc) ]);
-  $self->{driver}->print($email->as_string);
-  $self->{driver}->send;
+    1;
+  };
 
-  return '';
+  $error = $@ if !$ok;
+
+  $self->_store_in_journal;
+
+  return $ok ? '' : "send email: $error";
+}
+
+sub _all_recipients {
+  my ($self) = @_;
+
+  $self->{addresses} ||= {};
+  return map { @{ $self->{addresses}->{$_} || [] } } qw(to cc bcc);
+}
+
+sub _store_in_journal {
+  my ($self, $status, $extended_status) = @_;
+
+  my $journal_enable = $::instance_conf->get_email_journal;
+
+  return if $journal_enable == 0;
+
+  $status          //= $self->{driver}->status if $self->{driver};
+  $status          //= 'failed';
+  $extended_status //= $self->{driver}->extended_status if $self->{driver};
+  $extended_status //= 'unknown error';
+
+  my @attachments;
+
+  @attachments = grep { $_ } map {
+    my $part = $self->_create_attachment_part($_);
+    if ($part) {
+      SL::DB::EmailJournalAttachment->new(
+        name      => $part->filename,
+        mime_type => $part->content_type,
+        content   => $part->body,
+      )
+    }
+  } @{ $self->{attachments} || [] } if $journal_enable > 1;
+
+  my $headers = join "\r\n", (bundle_by { join(': ', @_) } 2, @{ $self->{headers} || [] });
+
+  SL::DB::EmailJournal->new(
+    sender          => SL::DB::Manager::Employee->current,
+    from            => $self->{from}    // '',
+    recipients      => join(', ', $self->_all_recipients),
+    subject         => $self->{subject} // '',
+    headers         => $headers,
+    body            => $self->{message} // '',
+    sent_on         => DateTime->now_local,
+    attachments     => \@attachments,
+    status          => $status,
+    extended_status => $extended_status,
+  )->save;
 }
 
 1;