[Koha-cvs] CVS: koha imemberentry.pl,1.5,1.6 memberentry.pl,1.28,1.29 member-password.pl,1.4,1.5 moremember.pl,1.27,1.28 newjmember.pl,1.6,1.7

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv8503

Modified Files:
        imemberentry.pl memberentry.pl member-password.pl 
        moremember.pl newjmember.pl 
Log Message:
fixes for #207, 208, 211

Index: imemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/imemberentry.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** imemberentry.pl     8 Feb 2003 21:47:15 -0000       1.5
--- imemberentry.pl     8 Apr 2003 09:39:17 -0000       1.6
***************
*** 29,32 ****
--- 29,33 ----
  use C4::Search;
  use C4::Interface::CGI::Output;
+ use C4::Koha;
  use HTML::Template;
  
***************
*** 51,57 ****
  my $data=borrdata('',$member);
  
! $template->param({ startmenumember => startmenu('member'),
!                       endmenumember   => endmenu('member'),
!                       member          => $member });
  
  output_html_with_http_headers $input, $cookie, $template->output;
--- 52,72 ----
  my $data=borrdata('',$member);
  
! my @branches;
! my @select_branch;
! my %select_branches;
! my $branches=getbranches();
! foreach my $branch (keys %$branches) {
!       push @select_branch, $branch;
!       $select_branches{$branch} = $branches->{$branch}->{'branchname'};
! }
! my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
!                       -values   => address@hidden,
!                       -default  => $data->{'branchcode'},
!                       -labels   => \%select_branches,
!                       -size     => 1,
!                       -multiple => 0 );
! 
! $template->param(member => $member,
!                                               CGIbranch => $CGIbranch);
  
  output_html_with_http_headers $input, $cookie, $template->output;

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** memberentry.pl      26 Mar 2003 03:02:13 -0000      1.28
--- memberentry.pl      8 Apr 2003 09:39:18 -0000       1.29
***************
*** 180,184 ****
    $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
  
!   $template->param( 
                        member          => $member,
                        address         => $data->{'streetaddress'},
--- 180,199 ----
    $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
  
!       my @branches;
!       my @select_branch;
!       my %select_branches;
!       my $branches=getbranches();
!       foreach my $branch (keys %$branches) {
!               push @select_branch, $branch;
!               $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
!       }
!       my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
!                               -values   => address@hidden,
!                               -default  => $data->{'branchcode'},
!                               -labels   => \%select_branches,
!                               -size     => 1,
!                               -multiple => 0 );
! 
!   $template->param(
                        member          => $member,
                        address         => $data->{'streetaddress'},
***************
*** 209,213 ****
                        cardnumber      => $cardnumber,
                        dateofbirth     => $data->{'dateofbirth'},
!                       dateformat      => display_date_format());
  
  output_html_with_http_headers $input, $cookie, $template->output;
--- 224,229 ----
                        cardnumber      => $cardnumber,
                        dateofbirth     => $data->{'dateofbirth'},
!                       dateformat      => display_date_format(),
!                       CGIbranch => $CGIbranch);
  
  output_html_with_http_headers $input, $cookie, $template->output;

Index: member-password.pl
===================================================================
RCS file: /cvsroot/koha/koha/member-password.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** member-password.pl  16 Mar 2003 09:19:57 -0000      1.4
--- member-password.pl  8 Apr 2003 09:39:18 -0000       1.5
***************
*** 63,67 ****
        $defaultnewpassword.=substr($chars, int(rand(length($chars))),1);
      }
!     $template->param( surname     => $bor->{'surname'},
                        firstname   => $bor->{'firstname'},
                        userid      => $bor->{'userid'},
--- 63,68 ----
        $defaultnewpassword.=substr($chars, int(rand(length($chars))),1);
      }
!       $template->param(       othernames => $bor->{'othernames'},
!                       surname     => $bor->{'surname'},
                        firstname   => $bor->{'firstname'},
                        userid      => $bor->{'userid'},

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** moremember.pl       7 Apr 2003 14:05:24 -0000       1.27
--- moremember.pl       8 Apr 2003 09:39:18 -0000       1.28
***************
*** 69,72 ****
--- 69,73 ----
  $data->{'expiry'} = format_date($data->{'expiry'});
  $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
+ $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newjmember.pl       19 Feb 2003 05:22:01 -0000      1.6
--- newjmember.pl       8 Apr 2003 09:39:18 -0000       1.7
***************
*** 37,41 ****
  my $insert=$input->param('insert');
  
- #print $input->header;
  my $template = gettemplate("newjmember.tmpl");
  
--- 37,40 ----