Completing adding patronimage upload form to patron details screen.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index e854391..6a281ae 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,7 +1,13 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 <div class="patroninfo"><h5><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h5>
 <ul>
+<!-- TMPL_IF NAME="patronimages" -->
+<!-- TMPL_IF NAME="picture" -->
 <li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=<!-- TMPL_VAR NAME="cardnumber" -->" id="patronimage" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
+<!-- TMPL_ELSE -->
+<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
     <li><!-- TMPL_IF NAME="address"-->
             <!-- TMPL_VAR NAME="address" -->
     <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 0fe0596..968d6c6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -202,9 +202,10 @@ for (var i=0;i<ItemsNodes.length;i++){
        <!-- TMPL_IF NAME="CAN_user_tools" --><!-- TMPL_UNLESS NAME="picture" -->
                <form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
                 <fieldset class="brief"><legend>Upload Patron Image</legend>
-                    <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> does not currently have an image available. To import an image for <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="surname" -->, enter the name of an image file to upload.
+                   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> does not currently have an image available. To import an image for <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="surname" -->, enter the name of an image file to upload.
                    <input type="hidden" id="image" name="filetype" value="image" />
-                   <input type="hidden" id="patron" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+                   <input type="hidden" id="cardnumber" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+                   <input type="hidden" id="borrowernumber" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                     <ol>
                         <li>
                            <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />

diff --git a/members/patronimage.pl b/members/patronimage.pl
index 2ee992f..92b8612 100755 (executable)
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -21,7 +21,7 @@
 #
 
 use strict;
-use CGI qw(:standard escapeHTML);
+use CGI; #qw(:standard escapeHTML);
 use C4::Context;
 use C4::Members;
 
@@ -41,7 +41,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
 
@@ -65,13 +65,11 @@ if ($dberror) {
 # things will result... you have been warned!
 
 if ($imagedata) {
-    print $data->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 $data->redirect (-uri => "$urlbase/intranet-tmpl/prog/img/patron-blank.png");
+    warn "No image exists for $cardnumber";
+    exit;
 }
 
 exit;

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index 75dcbd0..849e1e3 100755 (executable)
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -45,6 +45,7 @@ my $filetype            = $input->param('filetype');
 my $cardnumber          = $input->param('cardnumber');
 my $uploadfilename      = $input->param('uploadfile');
 my $uploadfile          = $input->upload('uploadfile');
+my $borrowernumber      = $input->param('borrowernumber');
 
 #FIXME: This code is really in the rough. The variables need to be re-scoped as the two subs depend on global vars to operate.
 #       Other parts of this code could be optimized as well, I think. Perhaps the file upload could be done with YUI's upload
@@ -136,7 +137,12 @@ if ( $uploadfile ) {
        $template->param(filetype => $filetype );
 }
 
-output_html_with_http_headers $input, $cookie, $template->output;
+if ( $borrowernumber ) {
+    my $urlbase = $input->url(-base => 1 -rewrite => 1);
+    print $input->redirect ("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
+} else {
+    output_html_with_http_headers $input, $cookie, $template->output;
+}
 
 sub handle_dir {
     my ( $dir, $suffix ) = @_;