[Koha-cvs] CVS: koha/C4 Auth.pm,1.31,1.32

[Paul POULAIN]

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

Modified Files:
        Auth.pm 
Log Message:
bugfix : a missing } was placed at a wrong place. The auth did not work 
anymore...

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** Auth.pm     16 Mar 2004 20:29:04 -0000      1.31
--- Auth.pm     19 Mar 2004 15:07:29 -0000      1.32
***************
*** 351,356 ****
        my ($dbh, $userid, $password) = @_;
  # LDAP
!       my $sth=$dbh->prepare("select value from systempreferences where 
variable=?");
!       $sth->execute("ldapserver");
        my $ldapserver = C4::Context->preferences('ldapserver');
        if ($ldapserver) {
--- 351,356 ----
        my ($dbh, $userid, $password) = @_;
  # LDAP
! #     my $sth=$dbh->prepare("select value from systempreferences where 
variable=?");
! #     $sth->execute("ldapserver");
        my $ldapserver = C4::Context->preferences('ldapserver');
        if ($ldapserver) {
***************
*** 366,380 ****
                        return 0;
                } else {
!               #get the cardnumber
!               my $sth=$dbh->prepare("select cardnumber from borrowers where 
userid=?");
!               $sth->execute($userid);
!               if ($sth->rows) {
!                       my $cardnumber = $sth->fetchrow;
!                       #we have the cardnumber
!                       return 1,$cardnumber;
!               }
!               if ($userid eq C4::Context->config('user') && $password eq 
C4::Context->config('pass')) {
!                       # Koha superuser account
!                       return 2;
                }
        }
--- 366,381 ----
                        return 0;
                } else {
!                       #get the cardnumber
!                       my $sth=$dbh->prepare("select cardnumber from borrowers 
where userid=?");
!                       $sth->execute($userid);
!                       if ($sth->rows) {
!                               my $cardnumber = $sth->fetchrow;
!                               #we have the cardnumber
!                               return 1,$cardnumber;
!                       }
!                       if ($userid eq C4::Context->config('user') && $password 
eq C4::Context->config('pass')) {
!                               # Koha superuser account
!                               return 2;
!                       }
                }
        }
***************
*** 463,468 ****
  }
  
- }
- 
  END { }       # module clean-up code here (global destructor)
  1;
--- 464,467 ----