[Koha-cvs] CVS: koha newjmember.pl,1.2,1.3

[Andrew Arensburger]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv7831

Modified Files:
        newjmember.pl 
Log Message:
Removed trailing whitespace.
Added a FIXME comment.


Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newjmember.pl       14 Aug 2002 18:12:51 -0000      1.2
--- newjmember.pl       13 Oct 2002 07:51:10 -0000      1.3
***************
*** 1,6 ****
  #!/usr/bin/perl
  
! #script to print confirmation screen, then if accepted calls itself to insert 
data
  
  
  # Copyright 2000-2002 Katipo Communications
--- 1,8 ----
  #!/usr/bin/perl
  
! # $Id$
  
+ #script to print confirmation screen, then if accepted calls itself to insert 
data
+ # FIXME - Yes, but what does it _do_?
  
  # Copyright 2000-2002 Katipo Communications
***************
*** 36,46 ****
  my %data;
  my @names=$input->param;
! foreach my $key (@names){                                                     
                               
!   $data{$key}=$input->param($key);                                            
                               
! }  
  my $ok=0;
  
  my $string="The following compulsary fields have been left blank. Please push 
the back button
! and try again<p>";                                                            
                        
  for (my $i=0;$i<3;$i++){
    my $number=$data{"cardnumber_child_$i"};
--- 38,48 ----
  my %data;
  my @names=$input->param;
! foreach my $key (@names){
!   $data{$key}=$input->param($key);
! }
  my $ok=0;
  
  my $string="The following compulsary fields have been left blank. Please push 
the back button
! and try again<p>";
  for (my $i=0;$i<3;$i++){
    my $number=$data{"cardnumber_child_$i"};
***************
*** 49,79 ****
    my $dob=$data{"dateofbirth_child_$i"};
    my $sex=$data{"sex_child_$i"};
!   if ($number eq ''){                                                         
              
      if ($i == 0){
!       $string.=" Cardnumber<br>";                                             
                           
!       $ok=1;               
      }
    } else {
!     if ($firstname eq ''){                                                    
                     
!       $string.=" Given Names<br>";                                            
                            
!       $ok=1;                                                                  
                            
!     }                                                                         
                            
!     if ($surname eq ''){                                                      
                    
!       $string.=" Surname<br>";                                                
                            
!       $ok=1;                                                                  
                            
!     }
!     if ($dob eq ''){                                                          
                
!       $string.=" Date Of Birth<br>";                                          
                                  
!       $ok=1;                                                                  
                            
!     }
!     if ($sex eq ''){                                                          
                    
!       $string.=" Gender <br>";                                                
                            
!       $ok=1;                                                                  
                            
!     } 
!     my $valid=checkdigit(\%env,$data{"cardnumber_child_$i"});                 
                                  
!     if ($valid != 1){                                                         
                         
!       $ok=1;                                                                  
                         
        $string.=" Invalid Cardnumber $number<br>";
!     }                                
    }
  }
--- 51,81 ----
    my $dob=$data{"dateofbirth_child_$i"};
    my $sex=$data{"sex_child_$i"};
!   if ($number eq ''){
      if ($i == 0){
!       $string.=" Cardnumber<br>";
!       $ok=1;
      }
    } else {
!     if ($firstname eq ''){
!       $string.=" Given Names<br>";
!       $ok=1;
!     }
!     if ($surname eq ''){
!       $string.=" Surname<br>";
!       $ok=1;
!     }
!     if ($dob eq ''){
!       $string.=" Date Of Birth<br>";
!       $ok=1;
!     }
!     if ($sex eq ''){
!       $string.=" Gender <br>";
!       $ok=1;
!     }
!     my $valid=checkdigit(\%env,$data{"cardnumber_child_$i"});
!     if ($valid != 1){
!       $ok=1;
        $string.=" Invalid Cardnumber $number<br>";
!     }
    }
  }
***************
*** 84,92 ****
  if ($ok == 0){
    print mkheadr(1,'Confirm Record');
!   my $main="#99cc33";                                                         
                            
!   my $image="/images/background-mem.gif"; 
    for (my $i=0;$i<3;$i++){
      if ($data{"cardnumber_child_$i"} ne ''){
!       print mktablehdr;                                                       
                             
        print mktablerow(2,$main,bold('NEW MEMBER'),"",$image);
        my $name=$data{"firstname_child_$i"}.$data{"surname_child_$i"};
--- 86,94 ----
  if ($ok == 0){
    print mkheadr(1,'Confirm Record');
!   my $main="#99cc33";
!   my $image="/images/background-mem.gif";
    for (my $i=0;$i<3;$i++){
      if ($data{"cardnumber_child_$i"} ne ''){
!       print mktablehdr;
        print mktablerow(2,$main,bold('NEW MEMBER'),"",$image);
        my $name=$data{"firstname_child_$i"}.$data{"surname_child_$i"};
***************
*** 104,122 ****
        print mktablerow(2,'white',bold('School'),$data{"school_child_$i"});
        print mktablerow(2,'white',bold('General 
Notes'),$data{"altnotes_child_$i"});
!       
        print mktableft;
        print "<p>";
      }
    }
!   my $i=0;                                                                    
                         
!   my @inputs;                                                                 
                         
!   while (my ($key, $value) = each %data) {                                    
                         
!     $value=~ s/\"/%22/g;                                                      
                         
!     $inputs[$i]=["hidden","$key","$value"];                                   
                         
!     $i++;                                                                     
                         
!   }                                                                           
                         
!   $inputs[$i]=["submit","submit","submit"];                                   
                         
!   print mkformnotable("/cgi-bin/koha/insertjdata.pl",@inputs);                
                          
!   
  } else {
  
--- 106,124 ----
        print mktablerow(2,'white',bold('School'),$data{"school_child_$i"});
        print mktablerow(2,'white',bold('General 
Notes'),$data{"altnotes_child_$i"});
! 
        print mktableft;
        print "<p>";
      }
    }
!   my $i=0;
!   my @inputs;
!   while (my ($key, $value) = each %data) {
!     $value=~ s/\"/%22/g;
!     $inputs[$i]=["hidden","$key","$value"];
!     $i++;
!   }
!   $inputs[$i]=["submit","submit","submit"];
!   print mkformnotable("/cgi-bin/koha/insertjdata.pl",@inputs);
! 
  } else {