DB-Upgrade-Skripte für 3.6.1

[mfinanz.git] / SL / Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 3dd6831f3e2337501d36cd38791848d1ec929074..f242120a964c89ec1593303556a7b49431ff46c4 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -29,11 +29,13 @@ use Encode;
 use File::MimeInfo::Magic;
 use File::Slurp;
 use List::UtilsBy qw(bundle_by);
 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::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 SL::Template;
 use SL::Version;
 


@@ -57,6 +59,7 @@ my %type_to_table = (
   letter                  => 'letter',
   purchase_delivery_order => 'delivery_orders',
   sales_delivery_order    => 'delivery_orders',
   letter                  => 'letter',
   purchase_delivery_order => 'delivery_orders',
   sales_delivery_order    => 'delivery_orders',

+  dunning                 => 'dunning',

 );
 
 sub new {
 );
 
 sub new {


@@ -120,8 +123,21 @@ sub _create_address_headers {
     next if !$self->{$item};
 
     my @header_addresses;
     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);
 
       push @{ $self->{addresses}->{$item} }, $addr_obj->address;
       next if $self->{driver}->keep_from_header($item);
 


@@ -151,8 +167,6 @@ sub _create_attachment_part {
   my $file_id       = 0;
   my $email_journal = $::instance_conf->get_email_journal;
 
   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';
   if (ref($attachment) eq "HASH") {
     $attributes{filename}     = $attachment->{name};
     $file_id                  = $attachment->{id}   || '0';


@@ -177,8 +191,6 @@ sub _create_attachment_part {
   $attachment_content ||= ' ';
   $attributes{charset}  = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
 
   $attachment_content ||= ' ';
   $attributes{charset}  = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
 

-  $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{content_type} . " filename=" . $attributes{filename});
-

   my $ent;
   if ( $attributes{content_type} eq 'message/rfc822' ) {
     $ent = Email::MIME->new($attachment_content);
   my $ent;
   if ( $attributes{content_type} eq 'message/rfc822' ) {
     $ent = Email::MIME->new($attachment_content);


@@ -211,8 +223,6 @@ sub _create_message {
 
   my @parts;
 
 
   my @parts;
 

-  push @{ $self->{headers} }, (Type => "multipart/mixed");
-

   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {
   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {


@@ -252,13 +262,13 @@ sub send {
   # Set defaults & headers
   $self->{charset}        =  'UTF-8';
   $self->{content_type} ||=  "text/plain";
   # Set defaults & headers
   $self->{charset}        =  'UTF-8';
   $self->{content_type} ||=  "text/plain";

-  $self->{headers}        =  [
+  $self->{headers}      ||=  [];
+  push @{ $self->{headers} }, (

     Subject               => $self->{subject},
     'Message-ID'          => '<' . $self->_create_message_id . '>',
     'X-Mailer'            => "kivitendo " . SL::Version->get_version,
     Subject               => $self->{subject},
     'Message-ID'          => '<' . $self->_create_message_id . '>',
     'X-Mailer'            => "kivitendo " . SL::Version->get_version,

-  ];
+  );

   $self->{mail_attachments} = [];
   $self->{mail_attachments} = [];

-  $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;

 
   my $error;
   my $ok = eval {
 
   my $error;
   my $ok = eval {


@@ -268,10 +278,6 @@ sub send {
 
     my $email = $self->_create_message;
 
 
     my $email = $self->_create_message;
 

-    #$::lxdebug->message(0, "message: " . $email->as_string);
-    # return "boom";
-
-    $::lxdebug->message(LXDebug->DEBUG2(), "mail1 from=".$self->{from}." to=".$self->{to});

     my $from_obj = (Email::Address->parse($self->{from}))[0];
 
     $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]);
     my $from_obj = (Email::Address->parse($self->{from}))[0];
 
     $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]);


@@ -375,7 +381,7 @@ SL::Mailer - Base class for sending mails from kivitendo
 
 =head1 OVERVIEW
 
 
 =head1 OVERVIEW
 

-Mail can be send from kivitendo via the sendmail command or the smtp protocol.
+Mail can be sent from kivitendo via the sendmail command or the smtp protocol.

 
 
 =head1 INTERNAL DATA TYPES
 
 
 =head1 INTERNAL DATA TYPES


@@ -385,7 +391,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol.
 
 =item C<%mail_delivery_modules>
 
 
 =item C<%mail_delivery_modules>
 

-  Currently two modules are supported either smtp or sendmail.
+  Currently two modules are supported: smtp or sendmail.

 
 =item C<%type_to_table>
 
 
 =item C<%type_to_table>
 


@@ -417,7 +423,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol.
 
 =item C<send>
 
 
 =item C<send>
 

-  If a mail was send successfully the internal functions _store_in_journal
+  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.
   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.


@@ -430,7 +436,10 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol.
 
 
   If $self->{journalentry} and either $self->{record_id} or $::form->{id} (checked in
 
 
   If $self->{journalentry} and either $self->{record_id} or $::form->{id} (checked in

-  this order) exists a record link from record to email journal is created.
+  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).
 
   Will fail silently if record_link creation wasn't successful (same behaviour as
   _store_in_journal).