Globale Variablen für Systemeinstellungen und Features nach %::lx_office_conf verschoben

[mfinanz.git] / scripts / task_server.pl

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index 5dae0b3a58b396923c55b4fb72c5c3ebe7c56bba..11c8f6694c8b516b56e48a817cd3e9be8bb0e381 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -42,17 +42,11 @@ sub lxinit {
 
   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;
@@ -121,7 +115,7 @@ sub gd_run {
       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;