X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=2f239524f91601733ff4362c548d290440879f8b;hb=f14f519c1e261380fac46994e8dec7614ed82d89;hp=cc886d8ca70ae19949ee4b6cfb70f6d5af5c58f6;hpb=a1124f720cf695519f29c41220cac7ff6c1ecf1b;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index cc886d8ca..2f239524f 100644
--- 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;
 
@@ -22,6 +23,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') {
@@ -138,15 +148,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);
@@ -230,7 +242,8 @@ sub handle_request {
 }
 
 sub unrequire_bin_mozilla {
-  return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+  my $self = shift;
+  return unless $self->{interface} =~ m/^(?:fastcgi|fcgid|fcgi)$/;
 
   for (keys %INC) {
     next unless m#^bin/mozilla/#;
@@ -295,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;