X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=am.pl;h=2d1605253c6a4367cd8706a58d2e81af8bcd2ae7;hb=e1ffd5ccf2157f5fab765a950ac8cdc07cc5d3b0;hp=98d990c8101884f83e4c435b1ec9386e7c5aaca9;hpb=40782548cf82ac1e4c0fe417113a4cb3072e9390;p=kivitendo-erp.git

diff --git a/am.pl b/am.pl
index 98d990c81..2d1605253 100755
--- a/am.pl
+++ b/am.pl
@@ -31,7 +31,8 @@
 #######################################################################
 
 BEGIN {
-  push(@INC, "modules");
+  unshift @INC, "modules/YAML"; # Use our own version of YAML.
+  push @INC, "modules";         # Only use our own versions of modules if there's no system version.
 }
 
 # setup defaults, DO NOT CHANGE
@@ -51,6 +52,7 @@ use SL::Form;
 use SL::Locale;
 
 eval { require "lx-erp.conf"; };
+eval { require "lx-erp-local.conf"; } if -f "lx-erp-local.conf";
 
 require "bin/mozilla/common.pl";
 
@@ -76,6 +78,8 @@ $script =~ s/\.pl//;
 # pull in DBI
 use DBI;
 
+$form->{login} =~ s|.*/||;
+
 # check for user config file, could be missing or ???
 eval { require("$userspath/$form->{login}.conf"); };
 if ($@) {
@@ -98,28 +102,23 @@ $locale = new Locale "$myconfig{countrycode}", "$script";
 $form->error($locale->text('Incorrect Password!'))
   if ($form->{password} ne $myconfig{password});
 
-$form->{path} =~ s/\.\.\///g;
-if ($form->{path} !~ /^bin\//) {
-  $form->error($locale->text('Invalid path!') . "\n");
-}
-
 # did sysadmin lock us out
 if (-e "$userspath/nologin") {
   $form->error($locale->text('System currently down for maintenance!'));
 }
 
 # pull in the main code
-require "$form->{path}/$form->{script}";
+require "bin/mozilla/$form->{script}";
 
 # customized scripts
-if (-f "$form->{path}/custom_$form->{script}") {
-  eval { require "$form->{path}/custom_$form->{script}"; };
+if (-f "bin/mozilla/custom_$form->{script}") {
+  eval { require "bin/mozilla/custom_$form->{script}"; };
   $form->error($@) if ($@);
 }
 
 # customized scripts for login
-if (-f "$form->{path}/$form->{login}_$form->{script}") {
-  eval { require "$form->{path}/$form->{login}_$form->{script}"; };
+if (-f "bin/mozilla/$form->{login}_$form->{script}") {
+  eval { require "bin/mozilla/$form->{login}_$form->{script}"; };
   $form->error($@) if ($@);
 }