new bekommt Hash-Params, nicht positionsbezogene

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index d52468eeedec8c936b2af7e2f242146bb9ba741d..3d5d0de5ced8dec64004f54fe28600c805f921de 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -8,14 +8,16 @@ use SL::Iconv;
 use strict;
 
 sub new {
 use strict;
 
 sub new {

-  my ($package, $form, $dbdriver) = @_;
-  my $self                        = { form => $form, dbdriver => $dbdriver };
-  return bless($self, $package);
+  my $package = shift;
+
+  return bless({}, $package)->init(@_);

 }
 
 }
 

-sub set_dbcharset {
-  my $self           = shift;
-  $self->{dbcharset} = shift;
+sub init {
+  my ($self, %params) = @_;
+
+  map { $self->{$_} = $params{$_} } keys %params;
+

   return $self;
 }
 
   return $self;
 }
 

diff --git a/SL/User.pm b/SL/User.pm
index a30d54136b4c70cb92b3cb45acf058784a35a278..ec09687054a4aafc704b6536b0a9b37e9ebe7ed5 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -125,7 +125,7 @@ sub login {
 
     $rc = 0;
 
 
     $rc = 0;
 

-    my $dbupdater = SL::DBUpgrade2->new($form, $myconfig{"dbdriver"});
+    my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $myconfig{dbdriver});

     my $controls  = $dbupdater->parse_dbupdate_controls;
 
     map({ $form->{$_} = $myconfig{$_} }
     my $controls  = $dbupdater->parse_dbupdate_controls;
 
     map({ $form->{$_} = $myconfig{$_} }


@@ -395,7 +395,7 @@ sub dbcreate {
   my $db_charset = $Common::db_encoding_to_charset{$form->{encoding}};
   $db_charset ||= Common::DEFAULT_CHARSET;
 
   my $db_charset = $Common::db_encoding_to_charset{$form->{encoding}};
   $db_charset ||= Common::DEFAULT_CHARSET;
 

-  my $dbupdater = SL::DBUpgrade2->new($form, $form->{dbdriver});
+  my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver});

   # create the tables
   $dbupdater->process_query($dbh, "sql/lx-office.sql", undef, $db_charset);
 
   # create the tables
   $dbupdater->process_query($dbh, "sql/lx-office.sql", undef, $db_charset);
 


@@ -457,7 +457,7 @@ sub dbneedsupdate {
   my ($self, $form) = @_;
 
   my %members  = $main::auth->read_all_users();
   my ($self, $form) = @_;
 
   my %members  = $main::auth->read_all_users();

-  my $controls = SL::DBUpgrade2->new($form, $form->{dbdriver})->parse_dbupdate_controls;
+  my $controls = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls;

 
   my ($query, $sth, %dbs_needing_updates);
 
 
   my ($query, $sth, %dbs_needing_updates);
 


@@ -597,7 +597,7 @@ sub dbupdate {
   my $db_charset = $main::dbcharset;
   $db_charset ||= Common::DEFAULT_CHARSET;
 
   my $db_charset = $main::dbcharset;
   $db_charset ||= Common::DEFAULT_CHARSET;
 

-  my $dbupdater = SL::DBUpgrade2->new($form, $form->{dbdriver});
+  my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver});

 
   foreach my $db (split(/ /, $form->{dbupdate})) {
 
 
   foreach my $db (split(/ /, $form->{dbupdate})) {