From daddd8316ca6908598b522bb2f9f029eb9356cf7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 6 May 2009 13:45:42 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20on=20garde=20les=20r=E9pertoires=20de=20?= =?UTF-8?q?l'entit=E9=201=20par=20d=E9faut=20pour=20compatibilit=E9=20afin?= =?UTF-8?q?=20d=E9viter=20de=20d=E9placer=20les=20r=E9pertoires=20Fix:=20o?= =?UTF-8?q?n=20cr=E9e=20la=20constante=20syslog=20en=20base=20afin=20de=20?= =?UTF-8?q?pouvoir=20cr=E9er=20des=20logs=20diff=E9rents=20par=20entit=E9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/core/conf.class.php | 2 +- htdocs/includes/modules/modSyslog.class.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index ada34ad52fc..2862914d061 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -166,7 +166,7 @@ class Conf $rootfordata = DOL_DATA_ROOT; // If multicompany module is enabled, we redefine the root of data - if (! empty($this->global->MAIN_MODULE_MULTICOMPANY) && ! empty($this->entity)) $rootfordata.='/'.$this->entity; + if (! empty($this->global->MAIN_MODULE_MULTICOMPANY) && ! empty($this->entity) && $this->entity > 1) $rootfordata.='/'.$this->entity; // For backward compatibility // TODO Remove params this->xxx->enabled. Must be replaced by conf->global->MAIN_MODULE_XXX diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php index 062cc3ed05b..e82539c7110 100644 --- a/htdocs/includes/modules/modSyslog.class.php +++ b/htdocs/includes/modules/modSyslog.class.php @@ -58,6 +58,11 @@ class modSyslog extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array(); + $r=0; + + $this->dirs[$r][0] = "output"; + $this->dirs[$r][1] = "/logs"; + $this->dirs[$r][2] = 1; // Config pages $this->config_page_url = array("syslog.php");