X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=am.pl;h=2d1605253c6a4367cd8706a58d2e81af8bcd2ae7;hb=fa8921cae403c79443c1ae26eedb0164a49263fa;hp=7e111f368997c51b276034e045a8e59e4a5d85d7;hpb=15682dc47316fcc2deab66730045cd38afec001f;p=kivitendo-erp.git

diff --git a/am.pl b/am.pl
index 7e111f368..2d1605253 100755
--- a/am.pl
+++ b/am.pl
@@ -30,6 +30,11 @@
 #
 #######################################################################
 
+BEGIN {
+  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
 $userspath  = "users";
 $templates  = "templates";
@@ -47,6 +52,9 @@ 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";
 
 if (defined($latex) && !defined($latex_templates)) {
   $latex_templates = $latex;
@@ -70,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 ($@) {
@@ -92,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 ($@);
 }
 
@@ -125,7 +130,7 @@ if ($form->{action}) {
     . $locale->text('Version')
     . " $form->{version} - $myconfig{name} - $myconfig{dbname}";
 
-  &{ $locale->findsub($form->{action}) };
+  call_sub($locale->findsub($form->{action}));
 } else {
   $form->error($locale->text('action= not defined!'));
 }