X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLxOfficeConf.pm;h=f6ae49ef07d8bfa3b76fe3d6a3dc9ee9a94a24fd;hb=991369b17d679e2855f4d5086d0b9769dc2ae1aa;hp=c1331867729d51ef0406e3b9fec0a71371a4b48f;hpb=5aaa3c621371557ed9fde80ef6a07e2b7959c0cb;p=kivitendo-erp.git

diff --git a/SL/LxOfficeConf.pm b/SL/LxOfficeConf.pm
index c13318677..f6ae49ef0 100644
--- a/SL/LxOfficeConf.pm
+++ b/SL/LxOfficeConf.pm
@@ -2,27 +2,55 @@ package SL::LxOfficeConf;
 
 use strict;
 
-use Config::Std;
 use Encode;
 
 my $environment_initialized;
 
+sub safe_require {
+  my ($class, $may_fail) = @_;
+
+  eval {
+    require Config::Std;
+    require SL::System::Process;
+    1;
+  } or do {
+    if ($may_fail) {
+      warn $@;
+      return 0;
+    } else {
+      die $@;
+    }
+  };
+
+  Config::Std->import;
+
+  return 1;
+}
+
 sub read {
-  my ($class, $file_name) = @_;
+  my ($class, $file_name, $may_fail) = @_;
 
-  read_config 'config/lx_office.conf.default' => %::lx_office_conf;
+  return unless $class->safe_require($may_fail);
+
+  # Backwards compatibility: read lx_office.conf.default if
+  # kivitendo.conf.default does't exist.
+  my $dir            = SL::System::Process->exe_dir;
+  my $default_config = -f "${dir}/config/kivitendo.conf.default" ? 'kivitendo' : 'lx_office';
+  read_config("${dir}/config/${default_config}.conf.default" => \%::lx_office_conf);
   _decode_recursively(\%::lx_office_conf);
 
-  $file_name ||= 'config/lx_office.conf';
+  $file_name ||= -f "${dir}/config/kivitendo.conf" ? "${dir}/config/kivitendo.conf" : "${dir}/config/lx_office.conf";
 
   if (-f $file_name) {
-    read_config $file_name => my %local_conf;
+    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 {
@@ -66,7 +94,7 @@ sub _init_environment {
 
     if ($info->{append_path}) {
       $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key};
-      $value = $ENV{$key} . $value;
+      $value = $ENV{$key} . $value if $ENV{$key};
     }
 
     $ENV{$key} = $value;