[Koha-cvs] CVS: koha/C4 Auth.pm,1.10,1.11

[Andrew Arensburger]

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

Modified Files:
	Auth.pm 
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.


Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Auth.pm	14 Aug 2002 18:12:51 -0000	1.10
--- Auth.pm	5 Oct 2002 09:48:35 -0000	1.11
***************
*** 24,28 ****
  
  require Exporter;
! use C4::Database;
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 24,28 ----
  
  require Exporter;
! use C4::Context;
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 52,56 ****
      my $message='';
  
!     my $dbh=C4Connect();
      my $sth=$dbh->prepare("select userid,ip,lasttime from sessions where sessionid=?");
      $sth->execute($sessionID);
--- 52,56 ----
      my $message='';
  
!     my $dbh = C4::Context->dbh;
      my $sth=$dbh->prepare("select userid,ip,lasttime from sessions where sessionid=?");
      $sth->execute($sessionID);
***************
*** 190,193 ****
--- 190,194 ----
  	}
      }
+     # FIXME - There's already a $sth in this scope.
      my $sth=$dbh->prepare("select password from borrowers where cardnumber=?");
      $sth->execute($userid);