X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=am.pl;h=2d1605253c6a4367cd8706a58d2e81af8bcd2ae7;hb=6d1df9ca24bbb8c03e10812ce4cf1b889d947470;hp=ef43d9d4f82d9e8e372de204f225da505c0f6429;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/am.pl b/am.pl
index ef43d9d4f..2d1605253 100755
--- a/am.pl
+++ b/am.pl
@@ -30,25 +30,39 @@
 #
 #######################################################################
 
+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";
+$userspath  = "users";
+$templates  = "templates";
 $memberfile = "users/members";
-$sendmail = "| /usr/sbin/sendmail -t";
+$sendmail   = "| /usr/sbin/sendmail -t";
 ########## end ###########################################
 
-
 $| = 1;
 
 use SL::LXDebug;
 $lxdebug = LXDebug->new();
 
+use CGI;
 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;
+  undef($latex);
+}
 
 $form = new Form;
+$cgi = new CGI('');
 
 # name of this script
 $0 =~ tr/\\/\//;
@@ -57,69 +71,69 @@ $script = substr($0, $pos + 1);
 
 # we use $script for the language module
 $form->{script} = $script;
+
 # strip .pl for translation files
 $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 ($@) {
   $locale = new Locale "$language", "$script";
-  
+
   $form->{callback} = "";
-  $msg1 = $locale->text('You are logged out!');
-  $msg2 = $locale->text('Login');
+  $msg1             = $locale->text('You are logged out!');
+  $msg2             = $locale->text('Login');
   $form->redirect("$msg1 <p><a href=login.pl target=_top>$msg2</a>");
 }
 
-
 $myconfig{dbpasswd} = unpack 'u', $myconfig{dbpasswd};
-map { $form->{$_} = $myconfig{$_} } qw(stylesheet charset) unless (($form->{action} eq 'save') && ($form->{type} eq 'preferences'));
+map { $form->{$_} = $myconfig{$_} } qw(stylesheet charset)
+  unless (($form->{action} eq 'save') && ($form->{type} eq 'preferences'));
 
 # locale messages
 $locale = new Locale "$myconfig{countrycode}", "$script";
 
 # check password
-$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");
-}
+$form->error($locale->text('Incorrect Password!'))
+  if ($form->{password} ne $myconfig{password});
 
 # 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 ($@);
 }
 
 if ($form->{action}) {
+
   # window title bar, user info
-  $form->{titlebar} = "Lx-Office ".$locale->text('Version'). " $form->{version} - $myconfig{name} - $myconfig{dbname}";
+  $form->{titlebar} =
+      "Lx-Office "
+    . $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!'));
 }
 
-
 # end