X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=login.pl;h=f216dd9c40393dacc3a02c684b836d9a726a70dc;hb=94e596e55cef6b9ef9b80b5a4dba8204e0c29c9f;hp=7753cc5b860393162e6f0aa68d6758b7e9eca859;hpb=9a16d0be9c85be4376c5841ede03211056ac68f6;p=kivitendo-erp.git

diff --git a/login.pl b/login.pl
index 7753cc5b8..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,8 +47,8 @@ $| = 1;
 use SL::LXDebug;
 $lxdebug = LXDebug->new();
 
-eval { require "lx-erp.conf"; };
-eval { require "lx-erp-local.conf"; } if -f "lx-erp-local.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});
@@ -71,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