X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLxOfficeConf.pm;h=4e26c4e25335f1587c53be56d5b91ddaa087fab6;hb=8e5b1f0e363dd22883e931006b8ac414bad9bbc5;hp=8f44016e6b43175493b2e32c0e7c12b000ed4e6e;hpb=3ceb381944924a7b6a14d69361754422b8b49589;p=kivitendo-erp.git

diff --git a/SL/LxOfficeConf.pm b/SL/LxOfficeConf.pm
index 8f44016e6..4e26c4e25 100644
--- a/SL/LxOfficeConf.pm
+++ b/SL/LxOfficeConf.pm
@@ -2,18 +2,52 @@ package SL::LxOfficeConf;
 
 use strict;
 
-use Config::Std;
 use Encode;
 
+my $environment_initialized;
+
+sub safe_require {
+  my ($class, $may_fail);
+
+  my $failed = !eval { require Config::Std; };
+
+  if ($failed) {
+    if ($may_fail) {
+      warn $@;
+      return 0;
+    } else {
+      die $@;
+    }
+  }
+
+  Config::Std->import;
+
+  return 1;
+}
+
 sub read {
-  read_config 'config/lx_office.conf.default' => %::lx_office_conf;
+  my ($class, $file_name, $may_fail) = @_;
+
+  return unless $class->safe_require($may_fail);
+
+  # Backwards compatibility: read lx_office.conf.default if
+  # kivitendo.conf.default does't exist.
+  my $default_config = -f "config/kivitendo.conf.default" ? 'kivitendo' : 'lx_office';
+  read_config("config/${default_config}.conf.default" => \%::lx_office_conf);
   _decode_recursively(\%::lx_office_conf);
 
-  if (-f 'config/lx_office.conf') {
-    read_config 'config/lx_office.conf' => my %local_conf;
+  $file_name ||= -f 'config/kivitendo.conf' ? 'config/kivitendo.conf' : 'config/lx_office.conf';
+
+  if (-f $file_name) {
+    read_config($file_name => \ my %local_conf);
     _decode_recursively(\%local_conf);
     _flat_merge(\%::lx_office_conf, \%local_conf);
   }
+
+  _init_environment();
+  _determine_application_paths();
+
+  return 1;
 }
 
 sub _decode_recursively {
@@ -41,4 +75,44 @@ sub _flat_merge {
   }
 }
 
+sub _init_environment {
+  return if $environment_initialized;
+
+  my %key_map = ( lib  => { name => 'PERL5LIB', append_path => 1 },
+                  path => { name => 'PATH',     append_path => 1 },
+                );
+  my $cfg     = $::lx_office_conf{environment} || {};
+
+  while (my ($key, $value) = each %{ $cfg }) {
+    next unless $value;
+
+    my $info = $key_map{$key} || {};
+    $key     = $info->{name}  || $key;
+
+    if ($info->{append_path}) {
+      $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key};
+      $value = $ENV{$key} . $value if $ENV{$key};
+    }
+
+    $ENV{$key} = $value;
+  }
+
+  $environment_initialized = 1;
+}
+
+sub _determine_application_paths {
+  my @paths = grep { $_ } split m/:/, $ENV{PATH};
+
+  foreach my $key (keys %{ $::lx_office_conf{applications} }) {
+    my ($program) = split m/\s+/, $::lx_office_conf{applications}->{$key};
+    next if $program =~ m|/|;
+
+    foreach my $path (@paths) {
+      next unless -f "${path}/${program}";
+      $::lx_office_conf{applications}->{$key} = "${path}/" . $::lx_office_conf{applications}->{$key};
+      last;
+    }
+  }
+}
+
 1;