[Koha-cvs] CVS: koha/C4 Auth.pm,1.36.2.6,1.36.2.7

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2151/C4

Modified Files:
      Tag: rel_2_2
        Auth.pm 
Log Message:
Fixing a bug in independant Branches management.


Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.6
retrieving revision 1.36.2.7
diff -C2 -r1.36.2.6 -r1.36.2.7
*** Auth.pm     30 Sep 2005 22:12:05 -0000      1.36.2.6
--- Auth.pm     5 Oct 2005 18:15:40 -0000       1.36.2.7
***************
*** 390,402 ****
                        if ($return == 1){
                                my 
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress);
!                               my $sth=$dbh->prepare("select 
cardnumber,borrowernumber,userid,firstname,surname,flags,branchcode,emailaddress
 from borrowers where userid=?");
                                $sth->execute($userid);
!                               
($cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress)
 = $sth->fetchrow;
!                               warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
!                               unless ($cardnumber){
!                                       my $sth=$dbh->prepare("select 
cardnumber,borrowernumber,userid,firstname,surname,flags,branchcode,emailaddress
 from borrowers where cardnumber=?");
                                        $sth->execute($cardnumber);
!                                       
($cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress)
 = $sth->fetchrow;
!                                       warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
                                }
                                my $hash = C4::Context::set_userenv(
--- 390,407 ----
                        if ($return == 1){
                                my 
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress);
!                               my $sth=$dbh->prepare("select 
borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers 
where userid=?");
                                $sth->execute($userid);
!                               
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = 
$sth->fetchrow if ($sth->rows);
! #                             warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
!                               unless ($sth->rows){
!                                       my $sth=$dbh->prepare("select 
borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers 
where cardnumber=?");
                                        $sth->execute($cardnumber);
!                                       
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = 
$sth->fetchrow if ($sth->rows);
! #                                     warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
!                                       unless ($sth->rows){
!                                               $sth->execute($userid);
!                                               
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = 
$sth->fetchrow if ($sth->rows);
!                                       }
! #                                     warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
                                }
                                my $hash = C4::Context::set_userenv(
***************
*** 410,414 ****
                                        $emailaddress,
                                );
!                               warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
                                $envcookie=$query->cookie(-name => 'userenv',
                                                -value => $hash,
--- 415,419 ----
                                        $emailaddress,
                                );
! #                             warn 
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
                                $envcookie=$query->cookie(-name => 'userenv',
                                                -value => $hash,