X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Freadingrec.pl;h=4ce115e09d85233ee7fe30085cbb09bdc391c3d4;hb=9f112ff75c2049cb3e5a259e38ad27a7282f53d2;hp=d1cf5cfb45740d5954597186cdd9547bedd6fce9;hpb=81ee945a580189e79a268f60d9e7638e92e85f26;p=koha.git

diff --git a/members/readingrec.pl b/members/readingrec.pl
index d1cf5cfb45..4ce115e09d 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -7,106 +7,97 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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;
+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::Dates qw/format_date/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 
-my $input = CGI->new;
+use Koha::Patrons;
+use Koha::Patron::Categories;
 
-#get borrower details
-my $data = undef;
-my $borrowernumber = undef;
-my $cardnumber = undef;
+my $input = CGI->new;
 
-my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tmpl",
+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 = GetAllIssues($borrowernumber,$order,$limit);
-
-my $branches = GetBranches();
-foreach my $issue ( @{$issues} ) {
-    $issue->{issuingbranch} = $branches->{ $issue->{branchcode} }->{branchname};
+my $issues = ();
+# Do not request the old issues of anonymous patron
+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($patron->borrowernumber,$order,$limit);
 }
 
 #   barcode export
-if ( $input->param('op') eq 'export_barcodes' ) {
-    my $today = C4::Dates->new();
-    $today = $today->output('iso');
-    my @barcodes =
-      map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
-    my $borrowercardnumber =
-      GetMember( borrowernumber => $borrowernumber )->{'cardnumber'};
-    my $delimiter = "\n";
-    binmode( STDOUT, ":encoding(UTF-8)" );
-    print $input->header(
-        -type       => 'application/octet-stream',
-        -charset    => 'utf-8',
-        -attachment => "$today-$borrowercardnumber-checkinexport.txt"
-    );
-    my $content = join $delimiter, uniq(@barcodes);
-    print $content;
-    exit;
-}
-
-if ( $data->{'category_type'} eq 'C') {
-    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
-    my $cnt = scalar(@$catcodes);
-    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
-    $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+if ( $op eq 'export_barcodes' ) {
+    # 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 = $patron->cardnumber;
+        my $delimiter = "\n";
+        binmode( STDOUT, ":encoding(UTF-8)" );
+        print $input->header(
+            -type       => 'application/octet-stream',
+            -charset    => 'utf-8',
+            -attachment => "$today-$borrowercardnumber-checkinexport.txt"
+        );
+
+        my $content = join $delimiter, uniq(@barcodes);
+        print $content;
+        exit;
+    }
 }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 if (! $limit){
 	$limit = 'full';
 }
 
-
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
-$template->param( picture => 1 ) if $picture;
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
+    my $attributes = GetBorrowerAttributes($patron->borrowernumber);
     $template->param(
         ExtendedPatronAttributes => 1,
         extendedattributes => $attributes
@@ -114,31 +105,9 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 }
 
 $template->param(
+    patron            => $patron,
     readingrecordview => 1,
-    title             => $data->{title},
-    initials          => $data->{initials},
-    surname           => $data->{surname},
-    othernames        => $data->{othernames},
-    borrowernumber    => $borrowernumber,
-    firstname         => $data->{firstname},
-    cardnumber        => $data->{cardnumber},
-    categorycode      => $data->{categorycode},
-    category_type     => $data->{category_type},
-    categoryname      => $data->{description},
-    address           => $data->{address},
-    address2          => $data->{address2},
-    city              => $data->{city},
-    state             => $data->{state},
-    zipcode           => $data->{zipcode},
-    country           => $data->{country},
-    phone             => $data->{phone},
-    email             => $data->{email},
-    branchcode        => $data->{branchcode},
-    is_child          => ( $data->{category_type} eq 'C' ),
-    branchname        => $branches->{ $data->{branchcode} }->{branchname},
     loop_reading      => $issues,
-    activeBorrowerRelationship =>
-      ( C4::Context->preference('borrowerRelationship') ne '' ),
 );
 output_html_with_http_headers $input, $cookie, $template->output;