X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Freadingrec.pl;h=015c56c9d1f37a6e47416e57a67f91457832902f;hb=5643de4d79f274b35f92aa03f5f8cbc124359e52;hp=177923e32c73af51fc4ca7519169d21fdff872d4;hpb=cae4b980607be083e5e0fb163c4949c73d6347db;p=koha.git

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 177923e32c..015c56c9d1 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -20,70 +20,64 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Output;
 use C4::Members;
-use C4::Branch qw(GetBranches);
 use List::MoreUtils qw/any uniq/;
 use Koha::DateUtils;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::Patron::Images;
 
+use Koha::Patrons;
 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');
-    $data = GetMember(cardnumber => $cardnumber);
-    $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron
+    my $cardnumber = $input->param('cardnumber');
+    $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
 }
 if ($input->param('borrowernumber')) {
-    $borrowernumber = $input->param('borrowernumber');
-    $data = GetMember(borrowernumber => $borrowernumber);
+    my $borrowernumber = $input->param('borrowernumber');
+    $patron = Koha::Patrons->find( $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);
 }
 
-my $branches = GetBranches();
-
 #   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 =
-          GetMember( borrowernumber => $borrowernumber )->{'cardnumber'};
+        my $borrowercardnumber = $patron->cardnumber;
         my $delimiter = "\n";
         binmode( STDOUT, ":encoding(UTF-8)" );
         print $input->header(
@@ -98,41 +92,28 @@ 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 )  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' );
 if (! $limit){
 	$limit = 'full';
 }
 
-my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
-$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' ),
-    branchname        => $branches->{ $data->{branchcode} }->{branchname},
     loop_reading      => $issues,
-    activeBorrowerRelationship =>
-      ( C4::Context->preference('borrowerRelationship') ne '' ),
-    RoutingSerials => C4::Context->preference('RoutingSerials'),
 );
 output_html_with_http_headers $input, $cookie, $template->output;