Bug 14385: Squash of a lot of patches rebased

[koha.git] / opac / opac-patron-image.pl

diff --git a/opac/opac-patron-image.pl b/opac/opac-patron-image.pl
index 993969f..6c24e48 100755 (executable)
--- a/opac/opac-patron-image.pl
+++ b/opac/opac-patron-image.pl
@@ -18,12 +18,12 @@
 # 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 C4::Members;
 use CGI qw ( -utf8 );
 use CGI::Cookie;  # need to check cookies before having CGI parse the POST request
 use C4::Auth qw(:DEFAULT check_cookie_auth);
+use Koha::Patron::Images;
 
 my $query = new CGI;
 
@@ -33,21 +33,19 @@ unless (C4::Context->preference('OPACpatronimages')) {
 }
 
 my $needed_flags;
-my %cookies = fetch CGI::Cookie;
+my %cookies = CGI::Cookie->fetch;
 my $sessid = $cookies{'CGISESSID'}->value;
 my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags);
 my $borrowernumber = C4::Context->userenv->{'number'};
 
-my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
+my $patron_image = Koha::Patron::Images->find($borrowernumber);
 
-if ($dberror) {
-    print $query->header(status => '500 internal error');
-}
-
-if ($imagedata) {
-    print $query->header(-type => $imagedata->{'mimetype'},
-                         -Content_Length => length ($imagedata->{'imagefile'})),
-          $imagedata->{'imagefile'};
+if ($patron_image) {
+    print $query->header(
+        -type           => $patron_image->mimetype,
+        -Content_Length => length( $patron_image->imagefile )
+      ),
+      $patron_image->imagefile;
 } else {
     print $query->header(status => '404 patron image not found');
 }