Fix FSF address in directory members/

[koha_gimpoz] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 2f85349..7be3481 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -16,25 +16,39 @@
 # 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 warnings;
+
+use CGI;
+
 use C4::Auth;
 use C4::Output;
-use CGI;
 use C4::Members;
 use C4::Branch;
-
 use C4::Dates qw/format_date/;
-my $input=new CGI;
 
+my $input = CGI->new;
 
-my $borrowernumber=$input->param('borrowernumber');
 #get borrower details
-my $data=GetMember($borrowernumber,'borrowernumber');
-my $order=$input->param('order');
+my $data = undef;
+my $borrowernumber = undef;
+my $cardnumber = undef;
+
+if ($input->param('cardnumber')) {
+    $cardnumber = $input->param('cardnumber');
+    $data = GetMember(cardnumber => $cardnumber);
+    $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron
+}
+if ($input->param('borrowernumber')) {
+    $borrowernumber = $input->param('borrowernumber');
+    $data = GetMember(borrowernumber => $borrowernumber);
+}
+
+my $order=$input->param('order') || '';
 my $order2=$order;
 if ($order2 eq ''){
   $order2="date_due desc";
@@ -45,7 +59,7 @@ if ($limit){
     if ($limit eq 'full'){
                $limit=0;
     }
-} 
+}
 else {
   $limit=50;
 }
@@ -64,15 +78,14 @@ my @loop_reading;
 
 for (my $i=0;$i<$count;$i++){
        my %line;
-       if($i%2){
-               $line{'toggle'} = 1;
-       }
        $line{biblionumber}=$issues->[$i]->{'biblionumber'};
        $line{title}=$issues->[$i]->{'title'};
        $line{author}=$issues->[$i]->{'author'};
        $line{classification} = $issues->[$i]->{'classification'} || $issues->[$i]->{'itemcallnumber'};
        $line{date_due}=format_date($issues->[$i]->{'date_due'});
        $line{returndate}=format_date($issues->[$i]->{'returndate'});
+       $line{renewals}=$issues->[$i]->{'renewals'};
+       $line{barcode}=$issues->[$i]->{'barcode'};
        $line{volumeddesc}=$issues->[$i]->{'volumeddesc'};
        push(@loop_reading,\%line);
 }
@@ -85,8 +98,8 @@ if ( $data->{'category_type'} eq 'C') {
 }
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-if (! $limit){ 
-       $limit = 'full'; 
+if (! $limit){
+       $limit = 'full';
 }
 
 my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
@@ -110,12 +123,13 @@ $template->param(
                                                address2 => $data->{'address2'},
                                            city => $data->{'city'},
                                                zipcode => $data->{'zipcode'},
+                                               country => $data->{'country'},
                                                phone => $data->{'phone'},
                                                email => $data->{'email'},
                                                branchcode => $data->{'branchcode'},
                                                is_child        => ($data->{'category_type'} eq 'C'),
                                                branchname => GetBranchName($data->{'branchcode'}),
-                                               showfulllink => ($count > 50),                                  
+                                               showfulllink => ($count > 50),
                                                loop_reading => \@loop_reading);
 output_html_with_http_headers $input, $cookie, $template->output;