X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fviewlog.pl;h=1fbd6be1007a26c4d94a2e54fc97f602516b897c;hb=ef5d4f3c62957100dae0948a44bd27a2159892b4;hp=533f00ede0ae56395549cf00169c3c2d8cbbec18;hpb=f7644ec91f2d151535f8f5125c4057a9213d766e;p=koha_fer

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 533f00ede0..1fbd6be100 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -21,7 +21,7 @@
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Auth;
-use CGI qw/-utf8/;
+use CGI;
 use C4::Context;
 use C4::Koha;
 use C4::Dates;
@@ -72,7 +72,7 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
     use C4::Members;
     my $borrowernumber = $object;
     my $data = GetMember('borrowernumber'=>$borrowernumber);
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
     
     $template->param(   menu            => 1,
@@ -115,7 +115,7 @@ if ($do_it) {
     @data=@$results;
     my $total = scalar @data;
     foreach my $result (@data){
-	if ($result->{'info'} eq 'item'||$result->{module} eq "CIRCULATION"){
+	if (substr($result->{'info'}, 0, 4) eq 'item' || $result->{module} eq "CIRCULATION"){
 	    # get item information so we can create a working link
         my $itemnumber=$result->{'object'};
         $itemnumber=$result->{'info'} if ($result->{module} eq "CIRCULATION");
@@ -124,6 +124,28 @@ if ($do_it) {
 	    $result->{'biblioitemnumber'}=$item->{'biblionumber'};		
         $result->{'barcode'}=$item->{'barcode'};
 	}
+    #always add firstname and surname for librarian/user
+    if ($result->{'user'}){
+        my $userdetails = C4::Members::GetMemberDetails($result->{'user'});
+        if ($userdetails->{'firstname'}){
+            $result->{'userfirstname'} = $userdetails->{'firstname'};
+        }
+        if ($userdetails->{'surname'}){
+            $result->{'usersurname'} = $userdetails->{'surname'};
+        }
+    }
+    #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
+    if ($result->{module} eq "CIRCULATION" || $result->{module} eq "MEMBERS" || $result->{module} eq "FINES"){
+        if($result->{'object'}){
+            my $borrowerdetails = C4::Members::GetMemberDetails($result->{'object'});
+            if ($borrowerdetails->{'firstname'}){
+            $result->{'borrowerfirstname'} = $borrowerdetails->{'firstname'};
+            }
+            if ($borrowerdetails->{'surname'}){
+                $result->{'borrowersurname'} = $borrowerdetails->{'surname'};
+            }
+        }
+    }
     }
     
     if ( $output eq "screen" ) {