[Koha-cvs] CVS: koha/C4 Security.pm,1.3,1.4

[Andrew Arensburger]

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

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


Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Security.pm	14 Aug 2002 18:12:52 -0000	1.3
--- Security.pm	5 Oct 2002 09:53:00 -0000	1.4
***************
*** 22,26 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Format;
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 22,26 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Format;
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 34,38 ****
  sub Login {
    my ($env)=@_;
!   my $dbh=C4Connect;
    my @branches;
    my $query = "select * from branches order by branchname";
--- 34,38 ----
  sub Login {
    my ($env)=@_;
!   my $dbh = C4::Context->dbh;
    my @branches;
    my $query = "select * from branches order by branchname";
***************
*** 71,75 ****
      $sth->finish;
    }
-   $dbh->disconnect;
    &endint();
  }
--- 71,74 ----