X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f04a7950a3040894b77e09289a71d3931ce898d0..2c1c6a9a9204afad82c8e403f3fce1d0d4b9cd90:/scripts/task_server.pl

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index ee087dba4..c30905d66 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -31,28 +31,19 @@ use SL::Helper::DateTime;
 use SL::LXDebug;
 use SL::Locale;
 
-my %config;
+our %lx_office_conf;
 
 # this is a cleaned up version of am.pl
 # it lacks redirection, some html setup and most of the authentication process.
 # it is assumed that anyone with physical access and execution rights on this script
 # won't be hindered by authentication anyway.
 sub lxinit {
-  my $login = $config{task_server}->{login};
+  my $login = $lx_office_conf{task_server}->{login};
 
   package main;
 
-  { no warnings 'once';
-    $::userspath  = "users";
-    $::templates  = "templates";
-    $::sendmail   = "| /usr/sbin/sendmail -t";
-  }
-
-  eval { require "config/lx-erp.conf";       1; } or die $EVAL_ERROR;
-  eval { require "config/lx-erp-local.conf"; 1; } or die $EVAL_ERROR if -f "config/lx-erp-local.conf";
-
   $::lxdebug = LXDebug->new;
-  $::locale  = Locale->new($::language);
+  $::locale  = Locale->new($::lx_office_conf{system}->{language});
   $::cgi     = CGI->new qw();
   $::form    = Form->new;
   $::auth    = SL::Auth->new;
@@ -68,7 +59,7 @@ sub lxinit {
 }
 
 sub drop_privileges {
-  my $user = $::emmvee_conf{task_server}->{run_as};
+  my $user = $lx_office_conf{task_server}->{run_as};
   return unless $user;
 
   my ($uid, $gid);
@@ -98,10 +89,10 @@ sub drop_privileges {
 sub gd_preconfig {
   my $self = shift;
 
-  read_config $self->{configfile} => %config;
+  read_config $self->{configfile} => %lx_office_conf;
 
-  die "Missing section [task_server] in config file"                unless $config{task_server};
-  die "Missing key 'login' in section [task_server] in config file" unless $config{task_server}->{login};
+  die "Missing section [task_server] in config file"                unless $lx_office_conf{task_server};
+  die "Missing key 'login' in section [task_server] in config file" unless $lx_office_conf{task_server}->{login};
 
   drop_privileges();
   lxinit();
@@ -112,16 +103,16 @@ sub gd_preconfig {
 sub gd_run {
   while (1) {
     my $ok = eval {
-      $::lxdebug->message(0, "Retrieving jobs") if $config{task_server}->{debug};
+      $::lxdebug->message(0, "Retrieving jobs") if $lx_office_conf{task_server}->{debug};
 
       my $jobs = SL::DB::Manager::BackgroundJob->get_all_need_to_run;
 
-      $::lxdebug->message(0, "  Found: " . join(' ', map { $_->package_name } @{ $jobs })) if $config{task_server}->{debug} && @{ $jobs };
+      $::lxdebug->message(0, "  Found: " . join(' ', map { $_->package_name } @{ $jobs })) if $lx_office_conf{task_server}->{debug} && @{ $jobs };
 
       foreach my $job (@{ $jobs }) {
         # Provide fresh global variables in case legacy code modifies
         # them somehow.
-        $::locale = Locale->new($::language);
+        $::locale = Locale->new($::lx_office_conf{system}->{language});
         $::form   = Form->new;
 
         $job->run;
@@ -130,7 +121,7 @@ sub gd_run {
       1;
     };
 
-    if ($config{task_server}->{debug}) {
+    if ($lx_office_conf{task_server}->{debug}) {
       $::lxdebug->message(0, "Exception during execution: ${EVAL_ERROR}") if !$ok;
       $::lxdebug->message(0, "Sleeping");
     }