From 612ab65b729c8dc7618f48fd5b548c988bfcfea7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 Jul 2017 06:01:05 +0200
Subject: [PATCH] Fix by adding a MULTICOMPANY_BACKWARD_COMPATIBILITY option.
---
ChangeLog | 6 +++++-
htdocs/user/class/user.class.php | 30 ++++++++++++++++++++++++------
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2417a7db682..994902e3c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -142,8 +142,12 @@ Following changes may create regression for some external modules, but were nece
* Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
* Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
exists, but if an external module need action on it, it must provides itself its trigger file.
-* Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
+* Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode. So, if you set var
+ $multicompany_transverse_mode to 1 into your conf file, you must remove this line and a new key into
+ the Home - setup - other admin page.
* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
+* Some other change were done in the way we read permission of a user when module multicompany is enabled. You can
+ retreive the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
* The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output
content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
hook specifications so you must return output into "resprint".
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 577a6389b6f..77ee103db63 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -221,7 +221,7 @@ class User extends CommonObject
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
$sql.= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
else
- $sql.= " WHERE u.entity IN (0, ".($entity!=''?$entity:$conf->entity).")"; // search in entity provided in parameter
+ $sql.= " WHERE u.entity IN (0, ".(($entity!='' && $entity >= 0)?$entity:$conf->entity).")"; // search in entity provided in parameter
}
if ($sid) // permet une recherche du user par son SID ActiveDirectory ou Samba
@@ -236,8 +236,8 @@ class User extends CommonObject
{
$sql.= " AND u.rowid = ".$id;
}
- $sql.= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
-
+ $sql.= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
+
$result = $this->db->query($sql);
if ($result)
{
@@ -662,7 +662,14 @@ class User extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
$sql.= ", ".MAIN_DB_PREFIX."rights_def as r";
$sql.= " WHERE r.id = ur.fk_id";
- $sql.= " AND ur.entity = ".$conf->entity;
+ if (! empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
+ {
+ $sql.= " AND r.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?"1,":"").$conf->entity.")";
+ }
+ else
+ {
+ $sql.= " AND ur.entity = ".$conf->entity;
+ }
$sql.= " AND ur.fk_user= ".$this->id;
$sql.= " AND r.perms IS NOT NULL";
if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
@@ -708,8 +715,19 @@ class User extends CommonObject
$sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
$sql.= " ".MAIN_DB_PREFIX."rights_def as r";
$sql.= " WHERE r.id = gr.fk_id";
- $sql.= " AND gr.entity = ".$conf->entity;
- $sql.= " AND r.entity = ".$conf->entity;
+ if (! empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
+ {
+ if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+ $sql.= " AND gu.entity IN (0,".$conf->entity.")";
+ } else {
+ $sql.= " AND r.entity = ".$conf->entity;
+ }
+ }
+ else
+ {
+ $sql.= " AND gr.entity = ".$conf->entity;
+ $sql.= " AND r.entity = ".$conf->entity;
+ }
$sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
$sql.= " AND gu.fk_user = ".$this->id;
$sql.= " AND r.perms IS NOT NULL";
--
GitLab