Globales Konfigurationsobjekt %::lx_office_conf möglichst früh anlegen

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 687c373066113f373a11a4dca6acf03d3fc7d61f..e92af8b02463948c9002d4698b02d4d60fa733be 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -75,6 +75,9 @@ sub pre_startup_setup {
     require "config/lx-erp-local.conf";
   } if -f "config/lx-erp-local.conf";
 
     require "config/lx-erp-local.conf";
   } if -f "config/lx-erp-local.conf";
 

+  read_config 'config/lx_office.conf' => %::lx_office_conf;
+  _decode_recursively(\%::lx_office_conf);
+

   eval {
     package main;
     require "bin/mozilla/common.pl";
   eval {
     package main;
     require "bin/mozilla/common.pl";


@@ -94,9 +97,6 @@ sub pre_startup_setup {
     $::form        = undef;
     %::myconfig    = ();
     %::called_subs = (); # currently used for recursion detection
     $::form        = undef;
     %::myconfig    = ();
     %::called_subs = (); # currently used for recursion detection

-
-    read_config 'config/lx_office.conf' => %::lx_office_conf if -f "config/lx_office.conf";
-    _decode_recursively(\%::lx_office_conf);

   }
 
   $SIG{__WARN__} = sub {
   }
 
   $SIG{__WARN__} = sub {

diff --git a/scripts/console b/scripts/console
index added9f839fd9dfb8b32b765f4d09f4b821f7b4b..4d89fdb5787aaadfbfa30596eb79df30ae8805e2 100755 (executable)
--- a/scripts/console
+++ b/scripts/console
@@ -68,15 +68,15 @@ sub lxinit {
   eval { require "config/lx-erp.conf"; };
   eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf";
 
   eval { require "config/lx-erp.conf"; };
   eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf";
 

+  read_config 'config/lx_office.conf' => %::lx_office_conf;
+  SL::Dispatcher::_decode_recursively(\%::lx_office_conf);
+

   $::lxdebug = LXDebug->new;
   $::locale = Locale->new($::language);
   $::cgi    = CGI->new qw();
   $::form   = Form->new;
   $::auth   = SL::Auth->new;
 
   $::lxdebug = LXDebug->new;
   $::locale = Locale->new($::language);
   $::cgi    = CGI->new qw();
   $::form   = Form->new;
   $::auth   = SL::Auth->new;
 

-  read_config 'config/lx_office.conf' => %::lx_office_conf;
-  SL::Dispatcher::_decode_recursively(\%::lx_office_conf);
-

   die 'cannot reach auth db'               unless $::auth->session_tables_present;
 
   $::auth->restore_session;
   die 'cannot reach auth db'               unless $::auth->session_tables_present;
 
   $::auth->restore_session;