diff --git a/opac/opac-illrequests.pl b/opac/opac-illrequests.pl index 0219174cb7..c97f32b47a 100755 --- a/opac/opac-illrequests.pl +++ b/opac/opac-illrequests.pl @@ -59,56 +59,46 @@ $template->param( backends_available => $backends_available ); my $op = $params->{'method'} || 'list'; -if ( $op eq 'list' ) { - - my $requests = Koha::Illrequests->search( - { borrowernumber => $loggedinuser } - ); - my $req = Koha::Illrequest->new; - $template->param( - requests => $requests, - backends => $backends - ); - -} elsif ( $op eq 'view') { - my $request = Koha::Illrequests->find({ - borrowernumber => $loggedinuser, - illrequest_id => $params->{illrequest_id} - }); +my ( $illrequest_id, $request ); +if ( $illrequest_id = $params->{illrequest_id} ) { + $request = Koha::Illrequests->find($illrequest_id); # Make sure the request belongs to the logged in user unless ( $request->borrowernumber == $loggedinuser ) { print $query->redirect("/cgi-bin/koha/errors/404.pl"); exit; } +} + +if ( $op eq 'list' ) { + + my $requests = Koha::Illrequests->search( + { borrowernumber => $loggedinuser } + ); + $template->param( + requests => $requests, + backends => $backends + ); + +} elsif ( $op eq 'view') { $template->param( request => $request ); } elsif ( $op eq 'update') { - my $request = Koha::Illrequests->find({ - borrowernumber => $loggedinuser, - illrequest_id => $params->{illrequest_id} - }); $request->notesopac($params->{notesopac})->store; # Send a notice to staff alerting them of the update $request->send_staff_notice('ILL_REQUEST_MODIFIED'); print $query->redirect( - '/cgi-bin/koha/opac-illrequests.pl?method=view&illrequest_id=' . - $params->{illrequest_id} . - '&message=1' - ); + '/cgi-bin/koha/opac-illrequests.pl?method=view&illrequest_id=' + . $illrequest_id + . '&message=1' ); exit; } elsif ( $op eq 'cancreq') { - my $request = Koha::Illrequests->find({ - borrowernumber => $loggedinuser, - illrequest_id => $params->{illrequest_id} - }); $request->status('CANCREQ')->store; print $query->redirect( - '/cgi-bin/koha/opac-illrequests.pl?method=view&illrequest_id=' . - $params->{illrequest_id} . - '&message=1' - ); + '/cgi-bin/koha/opac-illrequests.pl?method=view&illrequest_id=' + . $illrequest_id + . '&message=1' ); exit; } elsif ( $op eq 'create' ) { if (!$params->{backend}) {