Bug 19532: (QA follow-up) Simplify resultset accessors

[srvgit] / members / patronimage.pl

diff --git a/members/patronimage.pl b/members/patronimage.pl
index c5e061a..e5b2b23 100755 (executable)
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -4,34 +4,33 @@
 #
 # 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; #qw(:standard escapeHTML);
+use CGI qw ( -utf8 );
+use C4::Auth qw( check_api_auth );
 use C4::Context;
-use C4::Members;
+use Koha::Patrons;
 
 $|=1;
 
-my $DEBUG = 0;
-my $data = new CGI;
-my $cardnumber;
+my $query = CGI->new;
+my $borrowernumber;
 
 =head1 NAME
 
@@ -39,45 +38,51 @@ patronimage.pl - Script for retrieving and formatting Koha patron images for dis
 
 =head1 SYNOPSIS
 
-<img src="patronimage.pl?crdnum= />
+<img src="patronimage.pl?borrowernumber= />
 
 =head1 DESCRIPTION
 
-This script, when called from within HTML and passed a valid patron cardnumber, will retrieve the image data associated with that cardnumber if one exists, format it in proper HTML format and pass it back to be displayed.
+This script, when called from within HTML and passed a valid patron borrowernumber, will retrieve the image data associated with that borrowernumber if one exists, format it in proper HTML format and pass it back to be displayed.
 
 =cut
 
-if ($data->param('crdnum')) {
-    $cardnumber = $data->param('crdnum');
-} else {
-    $cardnumber = shift;
-}
+my ($status, $cookie, $sessionID) = check_api_auth($query, [ { borrowers => '*' }, { circulate => '*' } ] );
 
+unless ( $status eq 'ok' ) {
+    print $query->header(-type => 'text/plain', -status => '403 Forbidden');
+    exit 0;
+}
 
-warn "Cardnumber passed in: $cardnumber" if $DEBUG;
+if ($query->param('borrowernumber')) {
+    $borrowernumber = $query->param('borrowernumber');
+} else {
+    $borrowernumber = shift;
+}
 
-my ($imagedata, $dberror) = GetPatronImage($cardnumber);
+my $patron         = Koha::Patrons->find( $borrowernumber );
+my $userenv = C4::Context->userenv;
+my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
 
-if ($dberror) {
-    warn "Database Error!";
-    exit;
+unless ( $logged_in_user->can_see_patron_infos( $patron ) ) {
+    print $query->header(-type => 'text/plain', -status => '403 Forbidden');
+    exit 0;
 }
 
+my $patron_image = $patron->image;
+
 # NOTE: Never dump the contents of $imagedata->{'patronimage'} via a warn to a log or nasty
 # things will result... you have been warned!
 
-if ($imagedata) {
-    print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -Content_Length => length ($imagedata->{'imagefile'})), $imagedata->{'imagefile'};
+if ($patron_image) {
+    print $query->header (-type => $patron_image->mimetype, -'Cache-Control' => 'no-store', -Content_Length => length ($patron_image->imagefile)), $patron_image->imagefile;
     exit;
 } else {
-    warn "No image exists for $cardnumber";
+    warn "No image exists for $borrowernumber";
     exit;
 }
 
 exit;
 
-=back
-
 =head1 AUTHOR
 
 Chris Nighswonger cnighswonger <at> foundations <dot> edu