[Koha-patches] [PATCH] If patronimages are enabled, show them in the patron search results

[Chris Cormack]

---
 .../prog/en/modules/members/member.tmpl            |   11 +++++++++++
 members/member.pl                                  |   20 +++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index fef7b69..058d265 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -32,6 +32,9 @@
 							<table id="memberresultst">
 							<thead>
 							<tr>
+							<!-- TMPL_IF NAME="patronimages" -->
+							<th>Photo</th>
+							<!-- /TMPL_IF -->
 							<th>Card</th>
 							<th>Name</th>
 							<th>Cat</th>
@@ -54,6 +57,14 @@
 							<tr>
 							<!-- /TMPL_UNLESS -->
 							<!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="patronimages" -->
+							<!-- TMPL_IF NAME="picture" -->
+							<td><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="max-width : 100px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:100px;" /></td>
+							<!-- TMPL_ELSE -->
+							<td><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;" /></td>
+							<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+							
 							<td><!-- TMPL_VAR NAME="cardnumber" --></td>
 							<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> <br /> <!-- TMPL_VAR NAME="address" --><!-- TMPL_IF NAME="address2" --><br /><!-- TMPL_VAR NAME="address2" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="city" --><br /><!-- TMPL_VAR NAME=city --><!-- /TMPL_IF --><!-- TMPL_IF NAME="zipcode" -->  <!-- TMPL_VAR NAME="zipcode" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF --></td>
 							<td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
diff --git a/members/member.pl b/members/member.pl
index dde29eb..81c7888 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -101,20 +101,26 @@ if ($results){
 my @resultsdata;
 my $to=($count>$to?$to:$count);
 my $index=$from;
+my $images = C4::Context->preference("patronimages");
 foreach my $borrower(@$results[$from..$to-1]){
   #find out stats
   my ($od,$issue,$fines)=GetMemberIssuesAndFines($$borrower{'borrowernumber'});
 
   $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref');
-
-  my %row = (
-    count => $index++,
+  my $picture;
+    my $dberror;
+    if ($images){
+	($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+    }
+    my %row = (
+        count => $index++,
 	%$borrower,
 	%{$categories_dislay{$$borrower{categorycode}}},
-    overdues => $od,
-    issues => $issue,
-    odissue => "$od/$issue",
-    fines =>  sprintf("%.2f",$fines),
+	overdues => $od,
+	issues => $issue,
+        odissue => "$od/$issue",
+        fines =>  sprintf("%.2f",$fines),
+        picture => $picture
     );
   push(@resultsdata, \%row);
 }
-- 
1.6.3.3