Bug 32842: Fix cataloguing/value_builder/unimarc_field_123j.pl

[koha-ffzg.git] / virtualshelves / sendshelf.pl

diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index e870928..8deeffd 100755 (executable)
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -26,13 +26,12 @@ use Try::Tiny qw( catch try );
 
 use C4::Auth qw( get_template_and_user );
 use C4::Biblio qw(
-    GetMarcISBN
-    GetMarcSubjects
+  GetMarcISBN
+  GetMarcSubjects
 );
-use C4::Items qw( GetItemsInfo );
 use C4::Output qw(
-    output_html_with_http_headers
-    output_and_exit
+  output_html_with_http_headers
+  output_and_exit
 );
 
 use Koha::Biblios;
@@ -41,121 +40,87 @@ use Koha::Virtualshelves;
 
 my $query = CGI->new;
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "virtualshelves/sendshelfform.tt",
-        query           => $query,
-        type            => "intranet",
-        flagsrequired   => { catalogue => 1 },
+        template_name => "virtualshelves/sendshelfform.tt",
+        query         => $query,
+        type          => "intranet",
+        flagsrequired => { catalogue => 1 },
     }
 );
 
 my $shelfid    = $query->param('shelfid');
 my $to_address = $query->param('email');
 
-my $shelf = Koha::Virtualshelves->find( $shelfid );
+my $shelf = Koha::Virtualshelves->find($shelfid);
 
 output_and_exit( $query, $cookie, $template, 'insufficient_permission' )
-    if $shelf && !$shelf->can_be_viewed( $loggedinuser );
+  if $shelf && !$shelf->can_be_viewed($borrowernumber);
 
 if ($to_address) {
     my $comment = $query->param('comment');
 
-    my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
-        {
-        template_name   => "virtualshelves/sendshelf.tt",
-        query           => $query,
-        type            => "intranet",
-        flagsrequired   => { catalogue => 1 },
-        }
-    );
-
-    my $contents = $shelf->get_contents;
-    my $marcflavour = C4::Context->preference('marcflavour');
+    my $patron     = Koha::Patrons->find($borrowernumber);
+    my $user_email = $patron->first_valid_email_address;
+    my $contents   = $shelf->get_contents;
+    my @biblionumbers;
     my $iso2709;
-    my @results;
 
     while ( my $content = $contents->next ) {
-        my $biblionumber     = $content->biblionumber;
-        my $biblio           = Koha::Biblios->find( $biblionumber ) or next;
-        my $dat              = $biblio->unblessed;
-        my $record           = $biblio->metadata->record({ embed_items => 1 });
-        my $marcauthorsarray = $biblio->get_marc_contributors;
-        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
-
-        my @items = GetItemsInfo($biblionumber);
-
-        $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
-        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
-        $dat->{MARCAUTHORS}    = $marcauthorsarray;
-        $dat->{'biblionumber'} = $biblionumber;
-        $dat->{ITEM_RESULTS}   = \@items;
-        $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
-
-        $iso2709 .= $record->as_usmarc();
-
-        push( @results, $dat );
+        push @biblionumbers, $content->biblionumber;
+        my $biblio = Koha::Biblios->find( $content->biblionumber );
+        $iso2709 .= $biblio->metadata->record->as_usmarc();
     }
 
-    $template2->param(
-        BIBLIO_RESULTS => \@results,
-        comment        => $comment,
-        shelfname      => $shelf->shelfname,
-    );
-
-    # Getting template result
-    my $template_res = $template2->output();
-    my $body;
-
-    my $subject;
-    # Analysing information and getting mail properties
-    if ( $template_res =~ /<SUBJECT>(?<subject>.*)<END_SUBJECT>/s ) {
-        $subject = $+{subject};
-        $subject =~ s|\n?(.*)\n?|$1|;
+    if ( !defined $iso2709 ) {
+        carp "Error sending mail: empty basket";
+        $template->param( error => 1 );
     }
-    else {
-        $subject = "no subject";
+    elsif ( !defined $user_email or $user_email eq '' ) {
+        carp "Error sending mail: sender's email address is invalid";
+        $template->param( error => 1 );
     }
+    else {
+        my %loops = ( biblio => \@biblionumbers, );
 
-    my $email_header = "";
-    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
-        $email_header = $1;
-        $email_header =~ s|\n?(.*)\n?|$1|;
-    }
+        my %substitute = (
+            comment  => $comment,
+            listname => $shelf->shelfname,
+        );
 
-    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
-        $body = $1;
-        $body =~ s|\n?(.*)\n?|$1|;
-    }
+        my $letter = C4::Letters::GetPreparedLetter(
+            module      => 'catalogue',
+            letter_code => 'LIST',
+            lang        => $patron->lang,
+            tables      => {
+                borrowers => $borrowernumber,
+            },
+            message_transport_type => 'email',
+            loops                  => \%loops,
+            substitute             => \%substitute,
+        );
 
-    my $THE_body = <<END_OF_BODY;
-$email_header
-$body
-END_OF_BODY
+        my $attachment = {
+            filename => 'shelf.iso2709',
+            type     => 'application/octet-stream',
+            content  => Encode::encode( "UTF-8", $iso2709 ),
+        };
 
-    try {
-        my $email = Koha::Email->create(
+        my $message_id = C4::Letters::EnqueueLetter(
             {
-                to      => $to_address,
-                subject => $subject,
+                letter                 => $letter,
+                message_transport_type => 'email',
+                borrowernumber         => $patron->borrowernumber,
+                to_address             => $to_address,
+                reply_address          => $user_email,
+                attachments            => [$attachment],
             }
         );
-        $email->text_body( $THE_body );
-        $email->attach(
-            Encode::encode("UTF-8", $iso2709),
-            content_type => 'application/octet-stream',
-            name         => 'shelf.iso2709',
-            disposition  => 'attachment',
-        );
 
-        my $library = Koha::Patrons->find( $borrowernumber )->library;
-        $email->send_or_die({ transport => $library->smtp_server->transport });
-        $template->param( SENT => "1" );
+        C4::Letters::SendQueuedMessages( { message_id => $message_id } );
+
+        $template->param( SENT => 1 );
     }
-    catch {
-        carp "Error sending mail: $_";
-        $template->param( error => 1 );
-    };
 
     $template->param( email => $to_address );
     output_html_with_http_headers $query, $cookie, $template->output;