X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDispatcher.pm;h=687c373066113f373a11a4dca6acf03d3fc7d61f;hb=2cbbdcc8d6bd92bc5a05b25b892cfde18c0a6611;hp=cc886d8ca70ae19949ee4b6cfb70f6d5af5c58f6;hpb=eb1efd213a130776d9f2068437e7d6e21f54dec5;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index cc886d8ca..687c37306 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -9,11 +9,15 @@ 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::Locale;
 use SL::Common;
+use SL::Helper::DateTime;
 use Form;
 use List::Util qw(first);
 use File::Basename;
@@ -22,6 +26,15 @@ use File::Basename;
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 
+sub new {
+  my ($class, $interface) = @_;
+
+  my $self           = bless {}, $class;
+  $self->{interface} = lc($interface || 'cgi');
+
+  return $self;
+}
+
 sub pre_request_checks {
   if (!$::auth->session_tables_present) {
     if ($::form->{script} eq 'admin.pl') {
@@ -81,6 +94,9 @@ sub pre_startup_setup {
     $::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 {
@@ -138,15 +154,17 @@ sub _run_controller {
 }
 
 sub handle_request {
+  my $self         = shift;
+  $self->{request} = shift;
+
   $::lxdebug->enter_sub;
   $::lxdebug->begin_request;
 
-  my $interface = lc(shift || 'cgi');
   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 
   $script_name = $ENV{SCRIPT_NAME};
 
-  unrequire_bin_mozilla($interface);
+  $self->unrequire_bin_mozilla;
 
   $::cgi         = CGI->new('');
   $::locale      = Locale->new($::language);
@@ -223,14 +241,15 @@ sub handle_request {
   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
-  Form::disconnect_standard_dbh();
+  Form::disconnect_standard_dbh unless $self->_interface_is_fcgi;
 
   $::lxdebug->end_request;
   $::lxdebug->leave_sub;
 }
 
 sub unrequire_bin_mozilla {
-  return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+  my $self = shift;
+  return unless $self->_interface_is_fcgi;
 
   for (keys %INC) {
     next unless m#^bin/mozilla/#;
@@ -240,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;
 
@@ -295,6 +319,24 @@ sub _route_controller_request {
   return ($controller, $action);
 }
 
+sub get_standard_filehandles {
+  my $self = shift;
+
+  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;