X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=239cdcb96de690bdbf75a60fd3ba997248a02f81;hb=1c385c602908735c3be266b1470b301050650fd3;hp=2f239524f91601733ff4362c548d290440879f8b;hpb=191f8d56e15187cf525d0cf4912f4d15768e527b;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 2f239524f..239cdcb96 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -8,14 +8,18 @@ BEGIN { } use CGI qw( -no_xhtml); +use Config::Std; use DateTime; +use Encode; use English qw(-no_match_vars); use SL::Auth; use SL::LXDebug; +use SL::LxOfficeConf; 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; @@ -32,7 +36,14 @@ sub new { return $self; } +sub interface_type { + my ($self) = @_; + return $self->{interface} eq 'cgi' ? 'CGI' : 'FastCGI'; +} + sub pre_request_checks { + _check_for_old_config_files(); + if (!$::auth->session_tables_present) { if ($::form->{script} eq 'admin.pl') { ::run(); @@ -41,7 +52,6 @@ sub pre_request_checks { show_error('login/auth_db_unreachable'); } } - $::auth->expire_sessions; } sub show_error { @@ -49,10 +59,10 @@ sub show_error { my $template = shift; my $error_type = shift || ''; - $::locale = Locale->new($::language); + $::locale = Locale->new($::lx_office_conf{system}->{language}); $::form->{error} = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session'); $::form->{error} = $::locale->text('Incorrect password!.') if ($error_type eq 'password'); - $::myconfig{countrycode} = $::language; + $::myconfig{countrycode} = $::lx_office_conf{system}->{language}; $::form->{stylesheet} = 'css/lx-office-erp.css'; $::form->header; @@ -63,14 +73,8 @@ sub show_error { } sub pre_startup_setup { - eval { - package main; - require "config/lx-erp.conf"; - }; - eval { - package main; - require "config/lx-erp-local.conf"; - } if -f "config/lx-erp-local.conf"; + SL::LxOfficeConf->read; + _init_environment(); eval { package main; @@ -81,11 +85,6 @@ sub pre_startup_setup { # canonial globals. if it's not here, chances are it will get refactored someday. { no warnings 'once'; - $::userspath = "users"; - $::templates = "templates"; - $::memberfile = "users/members"; - $::menufile = "menu.ini"; - $::sendmail = "| /usr/sbin/sendmail -t"; $::lxdebug = LXDebug->new; $::auth = SL::Auth->new; $::form = undef; @@ -161,7 +160,7 @@ sub handle_request { $self->unrequire_bin_mozilla; $::cgi = CGI->new(''); - $::locale = Locale->new($::language); + $::locale = Locale->new($::lx_office_conf{system}->{language}); $::form = Form->new; %::called_subs = (); @@ -181,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 "$::userspath/nologin" && $script ne 'admin'; + $::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); @@ -201,11 +200,11 @@ sub handle_request { $::locale = Locale->new($::myconfig{countrycode}); - show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0); + show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}); - $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password}); + $::auth->store_credentials_in_session(login => $::form->{login}, password => $::form->{password}); $::auth->create_or_refresh_session; - $::auth->delete_session_value('FLASH')->save_session(); + $::auth->delete_session_value('FLASH'); delete $::form->{password}; if ($action) { @@ -232,10 +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(); + Form::disconnect_standard_dbh; $::lxdebug->end_request; $::lxdebug->leave_sub; @@ -243,7 +246,7 @@ sub handle_request { sub unrequire_bin_mozilla { my $self = shift; - return unless $self->{interface} =~ m/^(?:fastcgi|fcgid|fcgi)$/; + return unless $self->_interface_is_fcgi; for (keys %INC) { next unless m#^bin/mozilla/#; @@ -253,6 +256,11 @@ sub unrequire_bin_mozilla { } } +sub _interface_is_fcgi { + my $self = shift; + return $self->{interface} =~ m/^(?:fastcgi|fcgid|fcgi)$/; +} + sub _route_request { my $script_name = shift; @@ -314,6 +322,39 @@ sub get_standard_filehandles { return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR); } +sub _init_environment { + my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 }, + path => { name => 'PATH', append_path => 1 }, + ); + my $cfg = $::lx_office_conf{environment} || {}; + + while (my ($key, $value) = each %{ $cfg }) { + next unless $value; + + my $info = $key_map{$key} || {}; + $key = $info->{name} || $key; + + if ($info->{append_path}) { + $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key}; + $value = $ENV{$key} . $value; + } + + $ENV{$key} = $value; + } +} + +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;