diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index afff50c3237ee3d6e27ab185b76a16cb4811286a..d43c83b1ea878ff39b9b5602f1e35e4c2d8e4dd5 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -183,6 +183,10 @@ class Conf // Exception: Some dir are not the name of module. So we keep exception here // for backward compatibility. + // Module user + $this->user->dir_output=$rootfordata."/users"; + $this->user->dir_temp=$rootfordata."/users/temp"; + // Module RSS $this->externalrss->dir_output=$rootfordata."/rss"; $this->externalrss->dir_temp=$rootfordata."/rss/temp"; diff --git a/htdocs/includes/modules/modComptabiliteExpert.class.php b/htdocs/includes/modules/modComptabiliteExpert.class.php index 867351ef5464c713d02fd84b9de7ad27e6b502a1..8490934e15527d2ed063243f22c20ec771d28e58 100644 --- a/htdocs/includes/modules/modComptabiliteExpert.class.php +++ b/htdocs/includes/modules/modComptabiliteExpert.class.php @@ -82,24 +82,36 @@ class modComptabiliteExpert extends DolibarrModules $this->dirs[$r][0] = "output"; $this->dirs[$r][1] = "/comptaexpert"; + $this->dirs[$r][2] = 1; + $this->dirs[$r][3] = ""; + $this->dirs[$r][4] = "comptaexpert"; $r++; $this->dirs[$r][0] = "temp"; $this->dirs[$r][1] = "/comptaexpert/temp"; + $this->dirs[$r][2] = 1; + $this->dirs[$r][3] = ""; + $this->dirs[$r][4] = "comptaexpert"; $r++; - $this->dirs[$r][0] = "rapport"; + $this->dirs[$r][0] = "output"; $this->dirs[$r][1] = "/comptaexpert/rapport"; + $this->dirs[$r][2] = 1; + $this->dirs[$r][3] = "rapport"; + $this->dirs[$r][4] = "comptaexpert"; $r++; - $this->dirs[$r][0] = "export"; + $this->dirs[$r][0] = "output"; $this->dirs[$r][1] = "/comptaexpert/export"; + $this->dirs[$r][2] = 1; + $this->dirs[$r][3] = "export"; + $this->dirs[$r][4] = "comptaexpert"; // Repertoires - $this->dirs = array(); - $this->dirs[0] = $conf->comptaexpert->dir_output; - $this->dirs[1] = $conf->comptaexpert->dir_output."/rapport"; - $this->dirs[2] = $conf->comptaexpert->dir_output."/export"; + //$this->dirs = array(); + //$this->dirs[0] = $conf->comptaexpert->dir_output; + //$this->dirs[1] = $conf->comptaexpert->dir_output."/rapport"; + //$this->dirs[2] = $conf->comptaexpert->dir_output."/export"; // Boites $this->boxes = array(); diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php index 290ce2cbc1aeb4989f64b50386e183db7ab5dce5..c24f5205a51b92e76f9ddd687d9ba2da3e488601 100644 --- a/htdocs/includes/modules/modUser.class.php +++ b/htdocs/includes/modules/modUser.class.php @@ -68,10 +68,12 @@ class modUser extends DolibarrModules $this->dirs[$r][0] = "output"; $this->dirs[$r][1] = "/users"; + $this->dirs[$r][2] = 1; $r++; $this->dirs[$r][0] = "temp"; $this->dirs[$r][1] = "/users/temp"; + $this->dirs[$r][2] = 1; // Config pages // $this->config_page_url = array("/user/admin/index.php"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 7f50287e6d8aa4efca4007ed63e6d8b3c62676cd..cad1c3a0ad02085e63a6fbd9fa661bfab2b4b12e 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> - * Copyright (C) 2005 Lionel COUSTEIX <etm_ltd@tiscali.co.uk> + * Copyright (C) 2005 Lionel Cousteix <etm_ltd@tiscali.co.uk> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by