X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDispatcher.pm;h=98c93d4f4092ed68eb3493f9fc471bff1fa88830;hb=a111d6e8e4071fd81d7406e7f3849d6ad28726fd;hp=2c0539bb899e2015287cccba63692de1f3063ea4;hpb=22b2ad7f224ef0a3e160ed9f302274d2f625f240;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 2c0539bb8..98c93d4f4 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -130,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);
@@ -159,7 +155,7 @@ sub handle_request {
       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
       ::run($::auth->restore_session);
 
-    } elsif ($action) {
+    } else {
       # copy from am.pl routines
       my $session_result = $::auth->restore_session;
 
@@ -176,14 +172,15 @@ sub handle_request {
       $::auth->create_or_refresh_session;
       delete $::form->{password};
 
-      map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
-        unless $action eq 'save' && $::form->{type} eq 'preferences';
-
-      $::form->set_standard_title;
-      ::call_sub('::' . $::locale->findsub($action));
+      if ($action) {
+        map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+          unless $action eq 'save' && $::form->{type} eq 'preferences';
 
-    } else {
-      $::form->error($::locale->text('action= not defined!'));
+        $::form->set_standard_title;
+        ::call_sub('::' . $::locale->findsub($action));
+      } else {
+        $::form->error($::locale->text('action= not defined!'));
+      }
     }
 
     1;
@@ -205,6 +202,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$/;