Initialisierung von %ENV von lx-erp.conf nach lx_office.conf verschoben

[mfinanz.git] / scripts / console

diff --git a/scripts/console b/scripts/console
index added9f839fd9dfb8b32b765f4d09f4b821f7b4b..5e85b026419052e77170292214ebb4e15f052469 100755 (executable)
--- a/scripts/console
+++ b/scripts/console
@@ -60,23 +60,21 @@ sub lxinit {
   package main;
 
   { no warnings 'once';
   package main;
 
   { no warnings 'once';

-    $::userspath  = "users";
-    $::templates  = "templates";

     $::sendmail   = "| /usr/sbin/sendmail -t";
   }
 
   eval { require "config/lx-erp.conf"; };
   eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf";
 
     $::sendmail   = "| /usr/sbin/sendmail -t";
   }
 
   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;