X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=76fcf6fb7b23f67b5dc6da8966f6f8a466323418;hb=7f1f5efedc0b738f8e8faaeca52f649150448e32;hp=909433ebdbde14b2d67d7ad410081fdb454ad21d;hpb=66ddc388f22a78ff14f7705a0d3d601e81440e04;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 909433ebd..76fcf6fb7 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -19,6 +19,7 @@ use SL::Locale; use SL::Common; use SL::Form; use SL::Helper::DateTime; +use SL::Template::Plugin::HTMLFixes; use List::Util qw(first); use File::Basename; @@ -51,7 +52,6 @@ sub pre_request_checks { show_error('login/auth_db_unreachable'); } } - $::auth->expire_sessions; } sub show_error { @@ -180,15 +180,15 @@ sub handle_request { $::form->{script} = "controller.pl"; } - pre_request_checks(); - eval { + pre_request_checks(); + my $session_result = $::auth->restore_session; $::auth->create_or_refresh_session; $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin'; - if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') { + if ($script eq 'login' or $script eq 'admin') { $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; ::run($session_result); @@ -231,12 +231,14 @@ sub handle_request { }; # cleanup + $::auth->expire_session_keys->save_session; + $::auth->expire_sessions; + $::auth->reset; + $::locale = undef; $::form = undef; $::myconfig = (); Form::disconnect_standard_dbh; - $::auth->expire_session_keys->save_session; - $::auth->reset; $::lxdebug->end_request; $::lxdebug->leave_sub;