projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nur dann steuern aufsummieren, wenn ein Steuerbetrag da ist und ein Steuerkonto ...
[kivitendo-erp.git]
/
SL
/
Dispatcher.pm
diff --git
a/SL/Dispatcher.pm
b/SL/Dispatcher.pm
index
4a3f131
..
687c373
100644
(file)
--- a/
SL/Dispatcher.pm
+++ b/
SL/Dispatcher.pm
@@
-9,11
+9,15
@@
BEGIN {
}
use CGI qw( -no_xhtml);
}
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::Locale;
use SL::Common;
use English qw(-no_match_vars);
use SL::Auth;
use SL::LXDebug;
use SL::Locale;
use SL::Common;
+use SL::Helper::DateTime;
use Form;
use List::Util qw(first);
use File::Basename;
use Form;
use List::Util qw(first);
use File::Basename;
@@
-90,6
+94,9
@@
sub pre_startup_setup {
$::form = undef;
%::myconfig = ();
%::called_subs = (); # currently used for recursion detection
$::form = undef;
%::myconfig = ();
%::called_subs = (); # currently used for recursion detection
+
+ read_config 'config/lx_office.conf' => %::lx_office_conf if -f "config/lx_office.conf";
+ _decode_recursively(\%::lx_office_conf);
}
$SIG{__WARN__} = sub {
}
$SIG{__WARN__} = sub {
@@
-234,7
+241,7
@@
sub handle_request {
$::locale = undef;
$::form = undef;
$::myconfig = ();
$::locale = undef;
$::form = undef;
$::myconfig = ();
- Form::disconnect_standard_dbh
()
;
+ Form::disconnect_standard_dbh
unless $self->_interface_is_fcgi
;
$::lxdebug->end_request;
$::lxdebug->leave_sub;
$::lxdebug->end_request;
$::lxdebug->leave_sub;
@@
-242,7
+249,7
@@
sub handle_request {
sub unrequire_bin_mozilla {
my $self = shift;
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/#;
for (keys %INC) {
next unless m#^bin/mozilla/#;
@@
-252,6
+259,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;
sub _route_request {
my $script_name = shift;
@@
-313,6
+325,18
@@
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);
+ }
+ }
+}
+
package main;
use strict;
package main;
use strict;