From 2b5f711720273ed54a4c7f7b1343a2b04b689168 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 30 Apr 2009 13:28:08 +0000
Subject: [PATCH] Fix: problem with user module constant
---
htdocs/core/conf.class.php | 4 ++++
.../modules/modComptabiliteExpert.class.php | 24 ++++++++++++++-----
htdocs/includes/modules/modUser.class.php | 2 ++
htdocs/user/fiche.php | 2 +-
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index afff50c3237..d43c83b1ea8 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 867351ef546..8490934e155 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 290ce2cbc1a..c24f5205a51 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 7f50287e6d8..cad1c3a0ad0 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
--
GitLab