Locking in eigenes Modul verschieben

[mfinanz.git] / SL / User.pm

diff --git a/SL/User.pm b/SL/User.pm
index ae4c3edef096d386ca0a622bd4cd11a422ee7202..294a1a3b4e38a22c16abf77b3f266c5117a716e1 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -43,6 +43,7 @@ use SL::DBUpgrade2;
 use SL::DBUtils;
 use SL::Iconv;
 use SL::Inifile;
 use SL::DBUtils;
 use SL::Iconv;
 use SL::Inifile;

+use SL::System::InstallationLock;

 
 use strict;
 
 
 use strict;
 


@@ -135,13 +136,7 @@ sub login {
   }
 
   # update the tables
   }
 
   # update the tables

-  my $fh;
-  if (!$::lx_office_conf{debug}->{keep_installation_unlocked} && !open($fh, ">", $::lx_office_conf{paths}->{userspath} . "/nologin")) {
-    $form->show_generic_error($main::locale->text('A temporary file could not be created. ' .
-                                                  'Please verify that the directory "#1" is writeable by the webserver.',
-                                                  $::lx_office_conf{paths}->{userspath}),
-                              'back_button' => 1);
-  }
+  SL::System::InstallationLock->lock;

 
   # ignore HUP, QUIT in case the webserver times out
   $SIG{HUP}  = 'IGNORE';
 
   # ignore HUP, QUIT in case the webserver times out
   $SIG{HUP}  = 'IGNORE';


@@ -151,10 +146,7 @@ sub login {
   $self->dbupdate2($form, $dbupdater);
   SL::DBUpgrade2->new(form => $::form, auth => 1)->apply_admin_dbupgrade_scripts(0);
 
   $self->dbupdate2($form, $dbupdater);
   SL::DBUpgrade2->new(form => $::form, auth => 1)->apply_admin_dbupgrade_scripts(0);
 

-  close($fh);
-
-  # remove lock file
-  unlink($::lx_office_conf{paths}->{userspath} . "/nologin");
+  SL::System::InstallationLock->unlock;

 
   print $form->parse_html_template("dbupgrade/footer");
 
 
   print $form->parse_html_template("dbupgrade/footer");