use C4::Auth qw( get_template_and_user );
use C4::Biblio qw(
- GetFrameworkCode
- GetMarcISBN
- GetMarcSubjects
+ GetFrameworkCode
+ GetMarcISBN
+ GetMarcSubjects
);
use C4::Output qw( output_html_with_http_headers );
use Koha::Biblios;
my $query = CGI->new;
# if virtualshelves is disabled, leave immediately
-if ( ! C4::Context->preference('virtualshelves') ) {
+if ( !C4::Context->preference('virtualshelves') ) {
print $query->redirect("/cgi-bin/koha/errors/404.pl");
exit;
}
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "opac-sendshelfform.tt",
- query => $query,
- type => "opac",
+ template_name => "opac-sendshelfform.tt",
+ query => $query,
+ type => "opac",
}
);
my $shelfid = $query->param('shelfid');
my $email = $query->param('email');
-my $shelf = Koha::Virtualshelves->find( $shelfid );
-if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
- if ( $email ) {
- my $comment = $query->param('comment');
-
- my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => "opac-sendshelf.tt",
- query => $query,
- type => "opac",
- authnotrequired => 1,
+my $shelf = Koha::Virtualshelves->find($shelfid);
+if ( $shelf and $shelf->can_be_viewed($borrowernumber) ) {
+ if ($email) {
+ my $comment = $query->param('comment');
+
+ my $patron = Koha::Patrons->find($borrowernumber);
+ my $user_email = $patron->first_valid_email_address;
+ my $shelf = Koha::Virtualshelves->find($shelfid);
+ my $contents = $shelf->get_contents;
+ my $iso2709;
+
+ my @biblionumbers;
+ while ( my $content = $contents->next ) {
+ push @biblionumbers, $content->biblionumber;
+ my $biblio = Koha::Biblios->find( $content->biblionumber );
+ $iso2709 .= $biblio->metadata->record->as_usmarc();
+ }
+
+ if ( !defined $iso2709 ) {
+ carp "Error sending mail: empty list";
+ $template->param( error => 1 );
+ }
+ 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 %substitute = (
+ comment => $comment,
+ listname => $shelf->shelfname,
+ );
+
+ 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 $attachment = {
+ filename => 'list.iso2709',
+ type => 'application/octet-stream',
+ content => Encode::encode( "UTF-8", $iso2709 ),
+ };
+
+ my $message_id = C4::Letters::EnqueueLetter(
+ {
+ letter => $letter,
+ message_transport_type => 'email',
+ borrowernumber => $patron->borrowernumber,
+ to_address => $email,
+ reply_address => $user_email,
+ attachments => [$attachment],
+ }
+ );
+
+ C4::Letters::SendQueuedMessages( { message_id => $message_id } );
+
+ $template->param( SENT => 1 );
}
- );
- my $patron = Koha::Patrons->find( $borrowernumber );
- my $user_email = $patron->first_valid_email_address;
- my $shelf = Koha::Virtualshelves->find( $shelfid );
- my $contents = $shelf->get_contents;
- my $iso2709;
-
- my @biblionumbers;
- while ( my $content = $contents->next ) {
- push @biblionumbers, $content->biblionumber;
- my $biblio = Koha::Biblios->find($content->biblionumber);
- $iso2709 .= $biblio->metadata->record->as_usmarc();
- };
-
- if ( !defined $iso2709 ) {
- carp "Error sending mail: empty list";
- $template->param( error => 1 );
- } 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 %substitute = (
- comment => $comment,
- listname => $shelf->shelfname,
- );
-
- my $letter = C4::Letters::GetPreparedLetter(
- module => 'catalogue',
- letter_code => 'LIST',
- lang => $patron->lang,
- tables => {
- borrowers => $borrowernumber,
- },
- message_transport_type => 'email',
- loops => \%loops,
- substitute => \%substitute,
+ $template->param(
+ shelfid => $shelfid,
+ email => $email,
);
+ output_html_with_http_headers $query, $cookie, $template->output,
+ undef, { force_no_caching => 1 };
- my $attachment = {
- filename => 'list.iso2709',
- type => 'application/octet-stream',
- content => Encode::encode("UTF-8", $iso2709),
- };
-
- C4::Letters::EnqueueLetter({
- letter => $letter,
- message_transport_type => 'email',
- borrowernumber => $patron->borrowernumber,
- to_address => $email,
- reply_address => $user_email,
- attachments => [$attachment],
- });
-
- $template->param( SENT => 1 );
}
-
+ else {
+ $template->param(
+ shelfid => $shelfid,
+ url => "/cgi-bin/koha/opac-sendshelf.pl",
+ );
+ output_html_with_http_headers $query, $cookie, $template->output,
+ undef, { force_no_caching => 1 };
+ }
+}
+else {
$template->param(
- shelfid => $shelfid,
- email => $email,
- );
- output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
-
- } else {
- $template->param( shelfid => $shelfid,
- url => "/cgi-bin/koha/opac-sendshelf.pl",
- );
- output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
- }
-} else {
- $template->param( invalidlist => 1,
- url => "/cgi-bin/koha/opac-sendshelf.pl",
+ invalidlist => 1,
+ url => "/cgi-bin/koha/opac-sendshelf.pl",
);
- output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
+ output_html_with_http_headers $query, $cookie, $template->output, undef,
+ { force_no_caching => 1 };
}