Task-Server mandantenfähig gemacht

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 0a2a97f417fbd160f4ae123511122ce41a0af7e8..0352b4371680febb28650465b9bc34229612abdd 100644 (file)
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -166,7 +166,11 @@ openofficeorg_daemon = 1
 openofficeorg_daemon_port = 2002
 
 [task_server]
 openofficeorg_daemon_port = 2002
 
 [task_server]

-# User name to use for database access
+# kivitendo client (either its name or its database ID) for database
+# access (both 'client' and 'login' are required)
+client =
+# kivitendo user (login) name to use for certain jobs (both 'client'
+# and 'login' are required)

 login =
 # Set to 1 for debug messages in /tmp/kivitendo-debug.log
 debug = 0
 login =
 # Set to 1 for debug messages in /tmp/kivitendo-debug.log
 debug = 0

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index 3a45dd1b4c110a573c0921cfd2cad56f9063f655..c8ad935f04f509438aa9edb339634471f7056362 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -41,7 +41,8 @@ use SL::System::TaskServer;
 our %lx_office_conf;
 
 sub lxinit {
 our %lx_office_conf;
 
 sub lxinit {

-  my $login = $lx_office_conf{task_server}->{login};
+  my $login  = $lx_office_conf{task_server}->{login};
+  my $client = $lx_office_conf{task_server}->{client};

 
   package main;
 
 
   package main;
 


@@ -49,6 +50,7 @@ sub lxinit {
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::auth          = SL::Auth->new;
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::auth          = SL::Auth->new;

+  die "No client configured or no client found with the name/ID '$client'" unless $::auth->set_client($client);

   $::instance_conf = SL::InstanceConfiguration->new;
   $::request       = { cgi => CGI->new({}) };
 
   $::instance_conf = SL::InstanceConfiguration->new;
   $::request       = { cgi => CGI->new({}) };
 


@@ -95,8 +97,9 @@ sub gd_preconfig {
 
   SL::LxOfficeConf->read($self->{configfile});
 
 
   SL::LxOfficeConf->read($self->{configfile});
 

-  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};
+  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};
+  die "Missing key 'client' in section [task_server] in config file" unless $lx_office_conf{task_server}->{client};

 
   drop_privileges();
   lxinit();
 
   drop_privileges();
   lxinit();