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 e6aa547..2f23952 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -5,16 +5,17 @@ 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.
-  push    @INC, "SL";               # FCGI won't find modules that are not properly named. Help it by inclduging SL
 }
 
 use CGI qw( -no_xhtml);
+use DateTime;
 use English qw(-no_match_vars);
 use SL::Auth;
 use SL::LXDebug;
 use SL::Locale;
 use SL::Common;
-use Form;
+use SL::Form;
+use SL::Helper::DateTime;
 use List::Util qw(first);
 use File::Basename;
 
@@ -147,7 +148,8 @@ sub _run_controller {
 }
 
 sub handle_request {
-  my $self = shift;
+  my $self         = shift;
+  $self->{request} = shift;
 
   $::lxdebug->enter_sub;
   $::lxdebug->begin_request;
@@ -306,6 +308,12 @@ 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);
+}
+
 package main;
 
 use strict;