X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=c1f31a4eff78a2c618e991fdc531eaf6e98c7406;hb=d018d87276e27a785ab119eb13fef83a5e15ba8c;hp=6512f0312714fa9ff48c233a6c7bc05cb2f10aa3;hpb=c90b4dcd8d8ee9f3e80c0b81bb5fc792ae4c9d03;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 6512f0312..c1f31a4ef 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; @@ -41,6 +42,8 @@ sub interface_type { } sub pre_request_checks { + _check_for_old_config_files(); + if (!$::auth->session_tables_present) { if ($::form->{script} eq 'admin.pl') { ::run(); @@ -234,7 +237,7 @@ sub handle_request { $::myconfig = (); Form::disconnect_standard_dbh; $::auth->expire_session_keys->save_session; - $::auth->dbdisconnect; + $::auth->reset; $::lxdebug->end_request; $::lxdebug->leave_sub; @@ -339,6 +342,18 @@ sub _init_environment { } } +sub _check_for_old_config_files { + my @old_files = grep { -f "config/${_}" } qw(authentication.pl console.conf lx-erp.conf lx-erp-local.conf); + return unless @old_files; + + $::form->{title} = $::locale->text('Old configuration files'); + $::form->{stylesheet} = 'lx-office-erp.css'; + $::form->header; + print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files }); + + ::end_of_request(); +} + package main; use strict;