X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=login.pl;h=f216dd9c40393dacc3a02c684b836d9a726a70dc;hb=46a67f95406aea6838636e7aa90d0f8833a96132;hp=f761de800eac940a1bd393d7d4fcd85e37cc4b3b;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/login.pl b/login.pl
index f761de800..f216dd9c4 100755
--- 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