projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
SL
/
Dispatcher.pm
diff --git
a/SL/Dispatcher.pm
b/SL/Dispatcher.pm
index
3913125
..
f22cf0e
100644
(file)
--- a/
SL/Dispatcher.pm
+++ b/
SL/Dispatcher.pm
@@
-5,7
+5,6
@@
use strict;
BEGIN {
unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
BEGIN {
unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
- push @INC, "SL"; # FCGI won't find modules that are not properly named. Help it by inclduging SL
}
use CGI qw( -no_xhtml);
}
use CGI qw( -no_xhtml);
@@
-15,10
+14,11
@@
use Encode;
use English qw(-no_match_vars);
use SL::Auth;
use SL::LXDebug;
use English qw(-no_match_vars);
use SL::Auth;
use SL::LXDebug;
+use SL::LxOfficeConf;
use SL::Locale;
use SL::Common;
use SL::Locale;
use SL::Common;
+use SL::Form;
use SL::Helper::DateTime;
use SL::Helper::DateTime;
-use Form;
use List::Util qw(first);
use File::Basename;
use List::Util qw(first);
use File::Basename;
@@
-66,8
+66,7
@@
sub show_error {
}
sub pre_startup_setup {
}
sub pre_startup_setup {
- read_config 'config/lx_office.conf' => %::lx_office_conf;
- _decode_recursively(\%::lx_office_conf);
+ SL::LxOfficeConf->read;
_init_environment();
eval {
_init_environment();
eval {
@@
-312,18
+311,6
@@
sub get_standard_filehandles {
return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR);
}
return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR);
}
-sub _decode_recursively {
- my ($obj) = @_;
-
- while (my ($key, $value) = each %{ $obj }) {
- if (ref($value) eq 'HASH') {
- _decode_recursively($value);
- } else {
- $obj->{$key} = decode('UTF-8', $value);
- }
- }
-}
-
sub _init_environment {
my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 },
path => { name => 'PATH', append_path => 1 },
sub _init_environment {
my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 },
path => { name => 'PATH', append_path => 1 },