Merge remote-tracking branch 'origin/new/bug_2629'

[koha_fer] / members / patronimage.pl

diff --git a/members/patronimage.pl b/members/patronimage.pl
index 84ce9f4..e76d117 100755 (executable)
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -13,15 +13,17 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 #
 #
 #
 
 use strict;
-use CGI qw(:standard escapeHTML);
+use warnings;
+
+use CGI; #qw(:standard escapeHTML);
 use C4::Context;
 use C4::Members;
 
@@ -33,7 +35,7 @@ my $cardnumber;
 
 =head1 NAME
 
-patronimage.pl - Script for retrieving and formating Koha patron images for display
+patronimage.pl - Script for retrieving and formatting Koha patron images for display
 
 =head1 SYNOPSIS
 
@@ -41,7 +43,7 @@ patronimage.pl - Script for retrieving and formating Koha patron images for disp
 
 =head1 DESCRIPTION
 
-This script, when called from within HTML and passed a valid patron cardnumber, will retrieve the image data associated with that cardnumber, 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 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.
 
 =cut
 
@@ -64,13 +66,16 @@ if ($dberror) {
 # NOTE: Never dump the contents of $imagedata->{'patronimage'} via a warn to a log or nasty
 # things will result... you have been warned!
 
-print header (-type => $imagedata->{'mimetype'}, -Content_Length => length ($imagedata->{'imagefile'})), 
-            $imagedata->{'imagefile'};
+if ($imagedata) {
+    print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -Content_Length => length ($imagedata->{'imagefile'})), $imagedata->{'imagefile'};
+    exit;
+} else {
+    warn "No image exists for $cardnumber";
+    exit;
+}
 
 exit;
 
-=back
-
 =head1 AUTHOR
 
 Chris Nighswonger cnighswonger <at> foundations <dot> edu