X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=8bd296804c3ea087e6d47728034c0e9593448fd2;hb=f521b94b94cbd7364006304546fc54c6815a48e2;hp=147b8cc3e4287781e3a99a56b1cefdf495d65bbc;hpb=879abbad15598aba736c740065bf03bceaacac83;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 147b8cc3e..8bd296804 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -16,9 +16,6 @@ use SL::Locale;
 use SL::Common;
 use Form;
 use List::Util qw(first);
-use Moose;
-use Rose::DB;
-use Rose::DB::Object;
 use File::Basename;
 
 # Trailing new line is added so that Perl will not add the line
@@ -85,6 +82,10 @@ sub pre_startup_setup {
     %::myconfig    = ();
     %::called_subs = (); # currently used for recursion detection
   }
+
+  $SIG{__WARN__} = sub {
+    $::lxdebug->warn(@_);
+  }
 }
 
 sub pre_startup_checks {
@@ -97,6 +98,7 @@ sub pre_startup {
 }
 
 sub require_main_code {
+  $::lxdebug->enter_sub;
   my ($script, $suffix) = @_;
 
   eval {
@@ -118,6 +120,7 @@ sub require_main_code {
     };
     $::form->error($EVAL_ERROR) if ($EVAL_ERROR);
   }
+  $::lxdebug->leave_sub;
 }
 
 sub handle_request {
@@ -127,13 +130,9 @@ sub handle_request {
   my $interface = lc(shift || 'cgi');
   my ($script_name, $action);
 
-  if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) {
-    $script_name = $ENV{SCRIPT_NAME};
-    unrequire_bin_mozilla();
+  $script_name = $ENV{SCRIPT_NAME};
 
-  } else {
-    $script_name = $0;
-  }
+  unrequire_bin_mozilla($interface);
 
   $::cgi         = CGI->new('');
   $::locale      = Locale->new($::language);
@@ -150,14 +149,14 @@ sub handle_request {
   pre_request_checks();
 
   eval {
+    $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin';
+
     if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
       ::run($::auth->restore_session);
 
     } elsif ($action) {
       # copy from am.pl routines
-      $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin';
-
       my $session_result = $::auth->restore_session;
 
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
@@ -202,6 +201,8 @@ sub handle_request {
 }
 
 sub unrequire_bin_mozilla {
+  return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+
   for (keys %INC) {
     next unless m#^bin/mozilla/#;
     next if /\bcommon.pl$/;