Bug 20518: Don't show "Messages" header and link on patron details if there are no...

[koha.git] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index ee835ba..015c56c 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -36,56 +36,48 @@ use Koha::Patron::Categories;
 
 my $input = CGI->new;
 
-#get borrower details
-my $data = undef;
-my $borrowernumber = undef;
-my $cardnumber = undef;
-
 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
                                query => $input,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {borrowers => 1},
+                flagsrequired => {borrowers => 'edit_borrowers'},
                                debug => 1,
                                });
 
 my $op = $input->param('op') || '';
 my $patron;
 if ($input->param('cardnumber')) {
-    $cardnumber = $input->param('cardnumber');
+    my $cardnumber = $input->param('cardnumber');
     $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
 }
 if ($input->param('borrowernumber')) {
-    $borrowernumber = $input->param('borrowernumber');
+    my $borrowernumber = $input->param('borrowernumber');
     $patron = Koha::Patrons->find( $borrowernumber );
 }
 
-unless ( $patron ) {
-    print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
-    exit;
-}
-$data = $patron->unblessed;
-$borrowernumber = $patron->borrowernumber;
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 my $order = 'date_due desc';
 my $limit = 0;
 my $issues = ();
 # Do not request the old issues of anonymous patron
-if ( $borrowernumber eq C4::Context->preference('AnonymousPatron') ){
+if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){
     # use of 'eq' in the above comparison is intentional -- the
     # system preference value could be blank
     $template->param( is_anonymous => 1 );
 } else {
-    $issues = GetAllIssues($borrowernumber,$order,$limit);
+    $issues = GetAllIssues($patron->borrowernumber,$order,$limit);
 }
 
 #   barcode export
 if ( $op eq 'export_barcodes' ) {
-    if ( $data->{'privacy'} < 2) {
+    # FIXME This should be moved out of this script
+    if ( $patron->privacy < 2) {
         my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
         my @barcodes =
           map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
-        my $borrowercardnumber = $data->{cardnumber};
+        my $borrowercardnumber = $patron->cardnumber;
         my $delimiter = "\n";
         binmode( STDOUT, ":encoding(UTF-8)" );
         print $input->header(
@@ -100,35 +92,27 @@ if ( $op eq 'export_barcodes' ) {
     }
 }
 
-if ( $data->{'category_type'} eq 'C') {
+if ( $patron->is_child ) {
     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
 }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
 if (! $limit){
        $limit = 'full';
 }
 
-$template->param( picture => 1 ) if $patron->image;
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
+    my $attributes = GetBorrowerAttributes($patron->borrowernumber);
     $template->param(
         ExtendedPatronAttributes => 1,
         extendedattributes => $attributes
     );
 }
 
-$template->param(%$data);
-
 $template->param(
+    patron            => $patron,
     readingrecordview => 1,
-    borrowernumber    => $borrowernumber,
-    privacy           => $data->{'privacy'},
-    categoryname      => $data->{description},
-    is_child          => ( $data->{category_type} eq 'C' ),
     loop_reading      => $issues,
 );
 output_html_with_http_headers $input, $cookie, $template->output;