[Koha-cvs] CVS: koha memberentry.pl,1.30,1.31 newjmember.pl,1.7,1.8 newmember.pl,1.9,1.10

[Paul POULAIN]

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

Modified Files:
        memberentry.pl newjmember.pl newmember.pl 
Log Message:
fix for #277

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** memberentry.pl      8 Apr 2003 11:12:39 -0000       1.30
--- memberentry.pl      8 Apr 2003 12:34:14 -0000       1.31
***************
*** 149,153 ****
                $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
        }
!       my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
                                -values   => address@hidden,
                                -default  => $data->{'branchcode'},
--- 149,153 ----
                $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
        }
!       my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
                                -values   => address@hidden,
                                -default  => $data->{'branchcode'},

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newjmember.pl       8 Apr 2003 09:39:18 -0000       1.7
--- newjmember.pl       8 Apr 2003 12:34:15 -0000       1.8
***************
*** 25,30 ****
--- 25,35 ----
  
  use strict;
+ use C4::Auth;
+ use C4::Context;
  use C4::Output;
  use C4::Input;
+ use C4::Interface::CGI::Output;
+ use C4::Interface::CGI::Template;
+ use C4::Koha;
  use CGI;
  use Date::Manip;
***************
*** 37,41 ****
  my $insert=$input->param('insert');
  
! my $template = gettemplate("newjmember.tmpl");
  
  #get rest of data
--- 42,53 ----
  my $insert=$input->param('insert');
  
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "newjmember.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {borrowers => 1},
!                            debug => 1,
!                            });
  
  #get rest of data
***************
*** 89,93 ****
  #             $ident{'main'}=$main;
  #             $ident{'image'}=$image;
!               $ident{'cardchlid')=($data{"cardnumber_child_$i"} ne '');
                if ($data{"cardnumber_child_$i"} ne ''){
                        my 
$name=$data{"firstname_child_$i"}.$data{"surname_child_$i"};
--- 101,105 ----
  #             $ident{'main'}=$main;
  #             $ident{'image'}=$image;
!               $ident{'cardchild'}=($data{"cardnumber_child_$i"} ne '');
                if ($data{"cardnumber_child_$i"} ne ''){
                        my 
$name=$data{"firstname_child_$i"}.$data{"surname_child_$i"};
***************
*** 97,101 ****
                        ($data{"sex_child_$i"} eq 'M') ? ($ident{'sex'}="Male") 
: ($ident{'sex'}="Female") ;
                        $ident{'school'}=$data{"school_child_$i"};
!                       $ident{'notes'}=$data{"altnotes_child_$i"}
                        push(@identsloop, \%ident);
                }
--- 109,113 ----
                        ($data{"sex_child_$i"} eq 'M') ? ($ident{'sex'}="Male") 
: ($ident{'sex'}="Female") ;
                        $ident{'school'}=$data{"school_child_$i"};
!                       $ident{'notes'}=$data{"altnotes_child_$i"};
                        push(@identsloop, \%ident);
                }
***************
*** 112,120 ****
  # FIXME IF main and image are not fetched by HTML::TEMPLATE get them into 
identsloop
  $template->param(     NOK => ($missing==1),
-                                                               main => $main,
-                                                               image => $image,
                                                                identsloop => 
address@hidden,
                                                                inputsloop => 
address@hidden,
                                                                string => 
$string);
  
! print "Content-Type: text/html\n\n", $template->output;
--- 124,130 ----
  # FIXME IF main and image are not fetched by HTML::TEMPLATE get them into 
identsloop
  $template->param(     NOK => ($missing==1),
                                                                identsloop => 
address@hidden,
                                                                inputsloop => 
address@hidden,
                                                                string => 
$string);
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** newmember.pl        26 Mar 2003 03:46:20 -0000      1.9
--- newmember.pl        8 Apr 2003 12:34:15 -0000       1.10
***************
*** 158,162 ****
                     joindate => format_date($data{'joining'}),
                     expdate => format_date($data{'expiry'}),
!                    joinbranch => $data{'joinbranch'},
                     ethnic => $ethnic,
                     dob => format_date($data{'dateofbirth'}),
--- 158,162 ----
                     joindate => format_date($data{'joining'}),
                     expdate => format_date($data{'expiry'}),
!                    branchcode => $data{'branchcode'},
                     ethnic => $ethnic,
                     dob => format_date($data{'dateofbirth'}),