X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1c8bbb4e4a123cbdb62106ba96378ef6a849713c..cc042e07ef78786b758b22cee75509815e59ba5b:/SL/Dispatcher.pm diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 620857459..8c450ad77 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -16,9 +16,6 @@ use SL::Locale; use SL::Common; use Form; use List::Util qw(first); -use Moose; -use Rose::DB; -use Rose::DB::Object; use File::Basename; # Trailing new line is added so that Perl will not add the line @@ -26,7 +23,14 @@ use File::Basename; use constant END_OF_REQUEST => "END-OF-REQUEST\n"; sub pre_request_checks { - show_error('login/auth_db_unreachable') unless $::auth->session_tables_present; + if (!$::auth->session_tables_present) { + if ($::form->{script} eq 'admin.pl') { + ::run(); + ::end_of_request(); + } else { + show_error('login/auth_db_unreachable'); + } + } $::auth->expire_sessions; } @@ -143,14 +147,14 @@ sub handle_request { pre_request_checks(); eval { + $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin'; + if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') { $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; ::run($::auth->restore_session); } elsif ($action) { # copy from am.pl routines - $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin'; - my $session_result = $::auth->restore_session; show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;