Fix for 418

[koha.git] / moremember.pl

diff --git a/moremember.pl b/moremember.pl
index a9c7b29..50ddd24 100755 (executable)
--- a/moremember.pl
+++ b/moremember.pl
@@ -34,10 +34,12 @@ use strict;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Charset;
+use C4::Interface::CGI::Output;
+use C4::Interface::CGI::Template;
 use CGI;
 use C4::Search;
 use Date::Manip;
+use C4::Date;
 use C4::Reserves2;
 use C4::Circulation::Renewals2;
 use C4::Circulation::Circ2;
@@ -63,12 +65,15 @@ my $bornum=$input->param('bornum');
 
 my $data=borrdata('',$bornum);
 
-$data->{'dateenrolled'} = slashifyDate($data->{'dateenrolled'});
-$data->{'expiry'} = slashifyDate($data->{'expiry'});
-$data->{'dateofbirth'} = slashifyDate($data->{'dateofbirth'});
+$data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
+$data->{'expiry'} = format_date($data->{'expiry'});
+$data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
+$data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
 
 $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
 
+$data->{&expand_sex_into_predicate($data->{'sex'})} = 1;
+
 if ($data->{'categorycode'} eq 'C'){
     my $data2=borrdata('',$data->{'guarantor'});
     $data->{'streetaddress'}=$data2->{'streetaddress'};
@@ -124,7 +129,7 @@ for (my$i=0;$i<$numaccts;$i++){
   my %row = %$accts->[$i];
   if ($amount2 != 0){
     my $item=" &nbsp; ";
-    $row{'date'} = slashifyDate($accts->[$i]{'date'});
+    $row{'date'} = format_date($accts->[$i]{'date'});
 
     if ($accts->[$i]{'accounttype'} ne 'Res'){
       #get item data
@@ -149,7 +154,7 @@ my $today=ParseDate('today');
 my @issuedata;
 for (my $i=0;$i<$count;$i++){
   my $datedue=ParseDate($issue->[$i]{'date_due'});
-  $issue->[$i]{'date_due'} = slashifyDate($issue->[$i]{'date_due'});
+  $issue->[$i]{'date_due'} = format_date($issue->[$i]{'date_due'});
   my %row = %{$issue->[$i]};
   if ($datedue < $today){
     $row{'red'}=1; #print "<font color=red>";
@@ -180,20 +185,16 @@ for (my $i=0;$i<$count;$i++){
 
 my ($rescount,$reserves)=FindReserves('',$bornum); #From C4::Reserves2
 
-# FIXME
-# does it make sense to turn this into a foreach my $i (0..$rescount)
-# kind of loop?
-#
 my @reservedata;
-for (my $i=0;$i<$rescount;$i++){
-  $reserves->[$i]{'reservedate2'} = slashifyDate($reserves->[$i]{'reservedate'});
-  my $restitle;
-  my %row = %$reserves->[$i];
-  if ($reserves->[$i]{'constrainttype'} eq 'o'){
-    $restitle=getreservetitle($reserves->[$i]{'biblionumber'},$reserves->[$i]{'borrowernumber'},$reserves->[$i]{'reservedate'},$reserves->[$i]{'timestamp'});
-    %row =  (%row , %$restitle);
-  }
-  push (@reservedata, \%row);
+foreach my $reserveline (@$reserves) {
+       $reserveline->{'reservedate2'} = format_date($reserveline->{'reservedate'});
+       my $restitle;
+       my %row = %$reserveline;
+       if ($reserveline->{'constrainttype'} eq 'o'){
+               $restitle=getreservetitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'timestamp'});
+               %row =  (%row , %$restitle);
+       }
+       push (@reservedata, \%row);
 }
 
 $template->param($data);
@@ -203,7 +204,4 @@ $template->param(
                 issueloop       => \@issuedata,
                 reserveloop     => \@reservedata);
 
-print $input->header(
-    -type => guesstype($template->output),
-    -cookie => $cookie
-),$template->output;
+output_html_with_http_headers $input, $cookie, $template->output;