Bug 21085: Fix add/edit of patrons when HouseboundModule is set

[koha.git] / members / patronimage.pl

diff --git a/members/patronimage.pl b/members/patronimage.pl
index 4161e97..f3534c3 100755 (executable)
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -4,33 +4,34 @@
 #
 # 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 ( -utf8 ); #qw(:standard escapeHTML);
+use CGI qw ( -utf8 );
+use C4::Auth qw( check_api_auth );
 use C4::Context;
 use C4::Members;
+use Koha::Patron::Images;
 
 $|=1;
 
 my $DEBUG = 0;
-my $data = new CGI;
+my $query = new CGI;
 my $borrowernumber;
 
 =head1 NAME
@@ -47,8 +48,17 @@ This script, when called from within HTML and passed a valid patron borrowernumb
 
 =cut
 
-if ($data->param('borrowernumber')) {
-    $borrowernumber = $data->param('borrowernumber');
+my ($status, $cookie, $sessionID) = check_api_auth($query, { catalogue => 1 } );
+
+unless ( $status eq 'ok' ) {
+    print $query->header(-type => 'text/plain', -status => '403 Forbidden');
+    exit 0;
+}
+
+
+
+if ($query->param('borrowernumber')) {
+    $borrowernumber = $query->param('borrowernumber');
 } else {
     $borrowernumber = shift;
 }
@@ -56,18 +66,13 @@ if ($data->param('borrowernumber')) {
 
 warn "Borrowernumber passed in: $borrowernumber" if $DEBUG;
 
-my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
-
-if ($dberror) {
-    warn "Database Error!";
-    exit;
-}
+my $patron_image = Koha::Patron::Images->find($borrowernumber);
 
 # 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 $borrowernumber";