[Koha-cvs] CVS: koha memberentry.pl,1.6.2.6,1.6.2.7 newmember.pl,1.1.1.1.2.2,1.1.1.1.2.3 insertdata.pl,1.7.2.1,1.7.2.2 simpleredirect.pl,1.1.1.1.2.2,1.1.1.1.2.3

[Finlay Thompson]

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

Modified Files:
      Tag: rel-1-2
        memberentry.pl newmember.pl insertdata.pl simpleredirect.pl 
Log Message:

the borrowernumber is now not allocated until the last stage. This avoids race 
conditions. removed the authentification from simpleredirect.pl


Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** memberentry.pl      11 Dec 2002 02:58:37 -0000      1.6.2.6
--- memberentry.pl      13 Jan 2003 22:50:00 -0000      1.6.2.7
***************
*** 26,32 ****
  
  my $member=$input->param('bornum');
! if ($member eq ''){
!   $member=NewBorrowerNumber();
! }
  my $type=$input->param('type');
  my $modify=$input->param('modify.x'); 
--- 26,32 ----
  
  my $member=$input->param('bornum');
! # if ($member eq ''){              THESE three lines have been removed.
! #   $member=NewBorrowerNumber();
! # }
  my $type=$input->param('type');
  my $modify=$input->param('modify.x'); 
***************
*** 67,70 ****
--- 67,71 ----
  # Not tonight though.
  #
+ 
  if ($cardnumber eq '' && $systemprefs{'autoMemberNum'} eq '1') {
    my $dbh=C4Connect;
***************
*** 82,86 ****
    my $sum;
    my $i = 0;
!   if (! $cardnumber) {                        # If DB has no values, start at 
1000000
      $cardnumber = 1000000;
    } else {
--- 83,88 ----
    my $sum;
    my $i = 0;
! 
!   if (! $cardnumber || $cardnumber eq 'super') {                      # If DB 
has no values, start at 1000000
      $cardnumber = 1000000;
    } else {
***************
*** 88,91 ****
--- 90,94 ----
    }
  
+ 
    while ($i <8) {                     # step from char 1 to 7.
      my $temp1 = $weightings[$i];      # read weightings, left to right, 1 
char at a time
***************
*** 104,107 ****
--- 107,111 ----
  }
  
+ 
  print <<printend
  
***************
*** 110,114 ****
  
  <tr valign=top><td  COLSPAN=2><input type=reset value="Clear all 
Fields"></td><td  COLSPAN=3   ALIGN=RIGHT ><font size=4 face='arial,helvetica'>
! Member# $member,   Card Number* <input type=text name=cardnumber size=10 
value="$cardnumber"><br>
  </td></tr>
  
--- 114,118 ----
  
  <tr valign=top><td  COLSPAN=2><input type=reset value="Clear all 
Fields"></td><td  COLSPAN=3   ALIGN=RIGHT ><font size=4 face='arial,helvetica'>
! Card Number* <input type=text name=cardnumber size=10 value="$cardnumber"><br>
  </td></tr>
  

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** newmember.pl        25 Oct 2002 17:23:42 -0000      1.1.1.1.2.2
--- newmember.pl        13 Jan 2003 22:50:14 -0000      1.1.1.1.2.3
***************
*** 93,97 ****
     print mktablerow(2,'white',bold('Name'),$name);
     print mktablerow(2,$main,bold('MEMBERSHIP DETAILS'),"",$image);
!    print mktablerow(2,'white',bold('Membership 
Number'),$data{'borrowernumber'});
     print mktablerow(2,'white',bold('Cardnumber'),$data{'cardnumber'});
     print mktablerow(2,'white',bold('Membership 
Category'),$data{'categorycode'});
--- 93,97 ----
     print mktablerow(2,'white',bold('Name'),$name);
     print mktablerow(2,$main,bold('MEMBERSHIP DETAILS'),"",$image);
! #   print mktablerow(2,'white',bold('Membership 
Number'),$data{'borrowernumber'});
     print mktablerow(2,'white',bold('Cardnumber'),$data{'cardnumber'});
     print mktablerow(2,'white',bold('Membership 
Category'),$data{'categorycode'});

Index: insertdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertdata.pl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** insertdata.pl       9 Sep 2002 19:56:55 -0000       1.7.2.1
--- insertdata.pl       13 Jan 2003 22:50:20 -0000      1.7.2.2
***************
*** 53,56 ****
--- 53,59 ----
  
  }else{
+     # create new borrowernumber here....
+     $data{'borrowernumber'} = NewBorrowerNumber();
+ 
    $data{'dateofbirth'}=ParseDate($data{'dateofbirth'});
    $data{'dateofbirth'}=UnixDate($data{'dateofbirth'},'%Y-%m-%d');

Index: simpleredirect.pl
===================================================================
RCS file: /cvsroot/koha/koha/simpleredirect.pl,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** simpleredirect.pl   10 Dec 2002 06:22:07 -0000      1.1.1.1.2.2
--- simpleredirect.pl   13 Jan 2003 22:50:24 -0000      1.1.1.1.2.3
***************
*** 12,20 ****
  # Authentication script added, superlibrarian set as default requirement
  
- my $flagsrequired;
- $flagsrequired->{superlibrarian}=1;
- my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, 
$flagsrequired);
- 
- 
  my $choice=$input->param('chooseform');
  
--- 12,15 ----