A5 sollte als Papiergröße ebenfalls funktionieren.

[kivitendo-erp.git] / login.pl

diff --git a/login.pl b/login.pl
index f491633..f216dd9 100755 (executable)
--- a/login.pl
+++ b/login.pl
@@ -31,7 +31,8 @@
 #######################################################################
 
 BEGIN {
-  push(@INC, "modules");
+  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.
 }
 
 # setup defaults, DO NOT CHANGE
@@ -46,7 +47,8 @@ $| = 1;
 use SL::LXDebug;
 $lxdebug = LXDebug->new();
 
-eval { require "lx-erp.conf"; };
+eval { require "config/lx-erp.conf"; };
+eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf";
 
 if ($ENV{CONTENT_LENGTH}) {
   read(STDIN, $_, $ENV{CONTENT_LENGTH});
@@ -70,6 +72,8 @@ $0 =~ tr/\\/\//;
 $pos = rindex $0, '/';
 $script = substr($0, $pos + 1);
 
+$form->{login} =~ s|.*/||;
+
 if (-e "$userspath/nologin" && $script ne 'admin.pl') {
   print "content-type: text/plain
 
@@ -81,54 +85,8 @@ Login disabled!\n";
 require "bin/mozilla/installationcheck.pl";
 verify_installation();
 
-if ($form{path}) {
-  $form{path} =~ s/%2f/\//gi;
-  $form{path} =~ s/\.\.\///g;
-
-  if ($form{path} !~ /^bin\//) {
-    print "content-type: text/plain
-
-Invalid path!\n";
-    die;
-  }
-
-  $ARGV[0] = "$_&script=$script";
-  require "$form{path}/$script";
-} else {
-
-  if (!$form{terminal}) {
-    if ($ENV{HTTP_USER_AGENT}) {
-
-      # web browser
-      if ($ENV{HTTP_USER_AGENT} =~ /(mozilla|links|opera|w3m)/i) {
-        $form{terminal} = "mozilla";
-      }
-
-    } else {
-      if ($ENV{TERM} =~ /xterm/) {
-        $form{terminal} = "xterm";
-      }
-      if ($ENV{TERM} =~ /(console|linux|vt.*)/i) {
-        $form{terminal} = "console";
-      }
-    }
-  }
-
-  if ($form{terminal}) {
-
-    $ARGV[0] = "path=bin/$form{terminal}&script=$script";
-    map { $ARGV[0] .= "&${_}=$form{$_}" } keys %form;
-
-    require "bin/$form{terminal}/$script";
-
-  } else {
-
-    print qq|
-  Unknown terminal
-  |;
-  }
-
-}
+$ARGV[0] = "$_&script=$script";
+require "bin/mozilla/$script";
 
 # end of main