OpenDocument Druck: foreach Konstrukte korrekt ausschneiden

[mfinanz.git] / SL / User.pm

diff --git a/SL/User.pm b/SL/User.pm
index a267fcd6f55afc73e020f047002672af858d7317..44efe5c58eae94028255c3eeae10f8e607a2d519 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -39,6 +39,7 @@ use Fcntl qw(:seek);
 
 #use SL::Auth;
 use SL::DB::AuthClient;
 
 #use SL::Auth;
 use SL::DB::AuthClient;

+use SL::DB::Employee;

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


@@ -123,10 +124,13 @@ 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;
 

-  return LOGIN_OK() if !$update_available;
+  if (!@unapplied_scripts) {
+    SL::DB::Manager::Employee->update_entries_for_authorized_users;
+    return LOGIN_OK();
+  }

 
   $form->{$_} = $::auth->client->{$_} for qw(dbname dbhost dbport dbuser dbpasswd);
   $form->{$_} = $myconfig{$_}         for qw(datestyle);
 
   $form->{$_} = $::auth->client->{$_} for qw(dbname dbhost dbport dbuser dbpasswd);
   $form->{$_} = $myconfig{$_}         for qw(datestyle);


@@ -138,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();
   }
 


@@ -151,6 +155,16 @@ sub login {
 
   $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname});
 
 
   $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname});
 

+  # If $self->dbupdate2 returns than this means all upgrade scripts
+  # have been applied successfully, none required user
+  # interaction. Otherwise the deeper layers would have called
+  # ::end_of_request() already, and return would not have returned to
+  # us. Therefore we can now use RDBO instances because their supposed
+  # table structures do match the actual structures. So let's ensure
+  # that the "employee" table contains the appropriate entries for all
+  # users authorized for the current client.
+  SL::DB::Manager::Employee->update_entries_for_authorized_users;
+

   SL::System::InstallationLock->unlock;
 
   print $form->parse_html_template("dbupgrade/footer");
   SL::System::InstallationLock->unlock;
 
   print $form->parse_html_template("dbupgrade/footer");


@@ -360,19 +374,19 @@ sub create_schema_info_table {
 }
 
 sub dbupdate2 {
 }
 
 sub dbupdate2 {

-  $main::lxdebug->enter_sub();
-

   my ($self, %params) = @_;
 
   my $form            = $params{form};
   my $dbupdater       = $params{updater};
   my $db              = $params{database};
   my ($self, %params) = @_;
 
   my $form            = $params{form};
   my $dbupdater       = $params{updater};
   my $db              = $params{database};

-  my $rc              = -2;

 
   map { $_->{description} = SL::Iconv::convert($_->{charset}, 'UTF-8', $_->{description}) } values %{ $dbupdater->{all_controls} };
 
   &dbconnect_vars($form, $db);
 
 
   map { $_->{description} = SL::Iconv::convert($_->{charset}, 'UTF-8', $_->{description}) } values %{ $dbupdater->{all_controls} };
 
   &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});


@@ -381,26 +395,35 @@ sub dbupdate2 {
 
   my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
 
 
   my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
 

-  $dbh->disconnect and next if !@upgradescripts;
-

   foreach my $control (@upgradescripts) {
   foreach my $control (@upgradescripts) {

-    # apply upgrade
+    # Apply upgrade. Control will only return to us if the upgrade has
+    # been applied correctly and if the update has not requested user
+    # interaction.

     $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
     print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
 
     $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
   }
 
     $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
     print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
 
     $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
   }
 

-  $rc = 0;

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

-
-  $main::lxdebug->leave_sub();
-
-  return $rc;

 }
 
 sub data {
   +{ %{ $_[0] } }
 }
 
 }
 
 sub data {
   +{ %{ $_[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;