Request: Dateiupload in form arrays[] gefixt

[mfinanz.git] / SL / User.pm

diff --git a/SL/User.pm b/SL/User.pm
index 8bb9b997bd68475b7518ad4fe1b9fa2e86a165dc..44efe5c58eae94028255c3eeae10f8e607a2d519 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -124,10 +124,10 @@ sub login {
   $self->create_schema_info_table($form, $dbh);
 
   my $dbupdater        = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;
   $self->create_schema_info_table($form, $dbh);
 
   my $dbupdater        = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;

-  my $update_available = $dbupdater->update2_available($dbh);
+  my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh);

   $dbh->disconnect;
 
   $dbh->disconnect;
 

-  if (!$update_available) {
+  if (!@unapplied_scripts) {

     SL::DB::Manager::Employee->update_entries_for_authorized_users;
     return LOGIN_OK();
   }
     SL::DB::Manager::Employee->update_entries_for_authorized_users;
     return LOGIN_OK();
   }


@@ -142,7 +142,7 @@ sub login {
   $form->{dbupdate} = "db" . $::auth->client->{dbname};
 
   if ($form->{"show_dbupdate_warning"}) {
   $form->{dbupdate} = "db" . $::auth->client->{dbname};
 
   if ($form->{"show_dbupdate_warning"}) {

-    print $form->parse_html_template("dbupgrade/warning");
+    print $form->parse_html_template("dbupgrade/warning", { unapplied_scripts => \@unapplied_scripts });

     ::end_of_request();
   }
 
     ::end_of_request();
   }
 


@@ -384,6 +384,9 @@ sub dbupdate2 {
 
   &dbconnect_vars($form, $db);
 
 
   &dbconnect_vars($form, $db);
 

+  # Flush potentially held database locks.
+  $form->get_standard_dbh->commit;
+

   my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
 
   $dbh->do($form->{dboptions}) if ($form->{dboptions});
   my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
 
   $dbh->do($form->{dboptions}) if ($form->{dboptions});


@@ -409,4 +412,18 @@ sub data {
   +{ %{ $_[0] } }
 }
 
   +{ %{ $_[0] } }
 }
 

+sub get_default_myconfig {
+  my ($self_or_class, %user_config) = @_;
+
+  return (
+    countrycode  => 'de',
+    css_path     => 'css',      # Needed for menunew, see SL::Layout::Base::get_stylesheet_for_user
+    dateformat   => 'dd.mm.yy',
+    numberformat => '1.000,00',
+    stylesheet   => 'kivitendo.css',
+    timeformat   => 'hh:mm',
+    %user_config,
+  );
+}
+

 1;
 1;