Always test your code, Moritz...

[mfinanz.git] / SL / Auth.pm

diff --git a/SL/Auth.pm b/SL/Auth.pm
index cd16c8e0bc48c4541adb5290bcff3b732b48008e..978fe497d80bff499c8a1fda2cffb5be70342feb 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -13,6 +13,7 @@ use SL::Auth::DB;
 use SL::Auth::LDAP;
 
 use SL::User;
 use SL::Auth::LDAP;
 
 use SL::User;

+use SL::DBConnect;

 use SL::DBUpgrade2;
 use SL::DBUtils;
 
 use SL::DBUpgrade2;
 use SL::DBUtils;
 


@@ -38,7 +39,7 @@ sub new {
 sub get_user_dbh {
   my ($self, $login) = @_;
   my %user = $self->read_user($login);
 sub get_user_dbh {
   my ($self, $login) = @_;
   my %user = $self->read_user($login);

-  my $dbh  = DBI->connect(
+  my $dbh  = SL::DBConnect->connect(

     $user{dbconnect},
     $user{dbuser},
     $user{dbpasswd},
     $user{dbconnect},
     $user{dbuser},
     $user{dbpasswd},


@@ -166,7 +167,7 @@ sub dbconnect {
 
   $main::lxdebug->message(LXDebug->DEBUG1, "Auth::dbconnect DSN: $dsn");
 
 
   $main::lxdebug->message(LXDebug->DEBUG1, "Auth::dbconnect DSN: $dsn");
 

-  $self->{dbh} = DBI->connect($dsn, $cfg->{user}, $cfg->{password}, { pg_enable_utf8 => $::locale->is_utf8, AutoCommit => 1 });
+  $self->{dbh} = SL::DBConnect->connect($dsn, $cfg->{user}, $cfg->{password}, { pg_enable_utf8 => $::locale->is_utf8, AutoCommit => 1 });

 
   if (!$may_fail && !$self->{dbh}) {
     $main::form->error($main::locale->text('The connection to the authentication database failed:') . "\n" . $DBI::errstr);
 
   if (!$may_fail && !$self->{dbh}) {
     $main::form->error($main::locale->text('The connection to the authentication database failed:') . "\n" . $DBI::errstr);


@@ -246,7 +247,7 @@ sub create_database {
   my $encoding   = $Common::charset_to_db_encoding{$charset};
   $encoding    ||= 'UNICODE';
 
   my $encoding   = $Common::charset_to_db_encoding{$charset};
   $encoding    ||= 'UNICODE';
 

-  my $dbh        = DBI->connect($dsn, $params{superuser}, $params{superuser_password}, { pg_enable_utf8 => $charset =~ m/^utf-?8$/i });
+  my $dbh        = SL::DBConnect->connect($dsn, $params{superuser}, $params{superuser_password}, { pg_enable_utf8 => $charset =~ m/^utf-?8$/i });

 
   if (!$dbh) {
     $main::form->error($main::locale->text('The connection to the template database failed:') . "\n" . $DBI::errstr);
 
   if (!$dbh) {
     $main::form->error($main::locale->text('The connection to the template database failed:') . "\n" . $DBI::errstr);


@@ -970,7 +971,7 @@ sub delete_group {
   my $self = shift;
   my $id   = shift;
 
   my $self = shift;
   my $id   = shift;
 

-  my $form = $main::from;
+  my $form = $main::form;

 
   my $dbh  = $self->dbconnect();
   $dbh->begin_work;
 
   my $dbh  = $self->dbconnect();
   $dbh->begin_work;