X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=kopf.pl;h=28ab157168c9a95df4c8ca0ff2cbd5a1eaa432db;hb=103dc24cfb9c645835d9f8533dc6f39051ab7dc8;hp=bae3cdc7dd40449a5fe4b44222b254d0841ad290;hpb=3f65b4fbe2856d5ab0a6a4ccee20c1a44d9d0cd1;p=kivitendo-erp.git

diff --git a/kopf.pl b/kopf.pl
index bae3cdc7d..28ab15716 100755
--- a/kopf.pl
+++ b/kopf.pl
@@ -2,21 +2,33 @@
 #
 
 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.
 }
 
 use SL::LXDebug;
 $lxdebug = LXDebug->new();
 
+use SL::Auth;
 use SL::Form;
 use SL::Locale;
 
-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");
 
 $form = new Form;
 
-eval { require("$userspath/$form->{login}.conf"); };
+our $auth     = SL::Auth->new();
+if (!$auth->session_tables_present()) {
+  _show_error('login/auth_db_unreachable');
+}
+$auth->expire_sessions();
+$auth->restore_session();
+
+our %myconfig = $auth->read_user($form->{login});
 
 $locale = new Locale "$myconfig{countrycode}", "kopf";
 
+delete $form->{password};
+
 eval { require "bin/mozilla/kopf.pl"; };