Bug 8435: (follow-up) make SearchSubscriptions handle lack of userenv

[koha.git] / members / patronimage.pl

diff --git a/members/patronimage.pl b/members/patronimage.pl
index bc9b14f..4f663d6 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;
 
@@ -29,32 +31,32 @@ $|=1;
 
 my $DEBUG = 0;
 my $data = new CGI;
-my $cardnumber;
+my $borrowernumber;
 
 =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
 
-<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, 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');
+if ($data->param('borrowernumber')) {
+    $borrowernumber = $data->param('borrowernumber');
 } else {
-    $cardnumber = shift;
+    $borrowernumber = shift;
 }
 
 
-warn "Cardnumber passed in: $cardnumber" if $DEBUG;
+warn "Borrowernumber passed in: $borrowernumber" if $DEBUG;
 
-my ($imagedata, $dberror) = GetPatronImage($cardnumber);
+my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
 
 if ($dberror) {
     warn "Database Error!";
@@ -65,19 +67,15 @@ if ($dberror) {
 # things will result... you have been warned!
 
 if ($imagedata) {
-    print header (-type => $imagedata->{'mimetype'}, -Content_Length => length ($imagedata->{'imagefile'})), $imagedata->{'imagefile'};
+    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" if $DEBUG;
-    my $urlbase = url(-base => 1 -rewrite => 1);
-    warn "URL base: $urlbase" if $DEBUG;
-    print redirect (-uri => "$urlbase/intranet-tmpl/prog/img/patron-blank.png");
+    warn "No image exists for $borrowernumber";
+    exit;
 }
 
 exit;
 
-=back
-
 =head1 AUTHOR
 
 Chris Nighswonger cnighswonger <at> foundations <dot> edu