X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=1d8b6e5d5e82c4c8fb1dce4e097eca1c7c47498c;hb=cb347e6ae7d6e1d67b25bafec66eb78c5fa232b1;hp=4b25ca749fd20a07de2c3fd11db1a052fc5170cf;hpb=6d6c50b47f599d04634b24914d222d461b728759;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 4b25ca749..1d8b6e5d5 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -223,7 +223,7 @@ sub handle_request {
     $::form->{action}  =~ s/( |-|,|\#)/_/g;
 
    ($script, $path, $suffix) = fileparse($script_name, ".pl");
-    require_main_code($script, $suffix);
+    require_main_code($script, $suffix) unless $script eq 'admin';
 
     $::form->{script} = $script . $suffix;
 
@@ -235,7 +235,7 @@ sub handle_request {
   eval {
     pre_request_checks(script => $script, action => $action, routing_type => $routing_type, script_name => $script_name);
 
-    if (   (-e ($::lx_office_conf{paths}->{userspath} . "/nologin"))
+    if (   SL::System::InstallationLock->is_locked
         && !is_admin_request(script => $script, script_name => $script_name, routing_type => $routing_type)) {
       $::form->error($::locale->text('System currently down for maintenance!'));
     }
@@ -248,11 +248,8 @@ sub handle_request {
       _require_controller('LoginScreen');
     }
 
-    if (($script eq 'login') && !$action) {
-      print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login');
-
-    } elsif ($script eq 'admin') {
-      ::run($session_result);
+    if ((($script eq 'login') && !$action) || ($script eq 'admin')) {
+      $self->redirect_to_login($script);
 
     } else {
       $self->redirect_to_login($script) if SL::Auth::SESSION_EXPIRED == $session_result;