From 19f1cd7787f2cf0d110a9c13c77bd0879bbd8b60 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 2 Nov 2017 13:16:00 +0100 Subject: [PATCH] Fix: move some check in multicompany module --- htdocs/user/group/perms.php | 15 ++------------- htdocs/user/perms.php | 10 ++-------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 46477879b14..836049443d3 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -38,11 +38,6 @@ $confirm=GETPOST('confirm', 'alpha'); $module=GETPOST('module', 'alpha'); $rights=GETPOST('rights', 'int'); -// Users/Groups management only in master entity if transverse mode -if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) -{ - accessforbidden(); -} // Defini si peux lire les permissions $canreadperms=($user->admin || $user->rights->user->user->lire); @@ -64,16 +59,10 @@ $object->fetch($id); $object->getrights(); $entity=$conf->entity; -if (! empty($conf->multicompany->enabled)) -{ - if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) - $entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity); - else - $entity=(! empty($object->entity) ? $object->entity : $conf->entity); -} // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('groupcard','globalcard')); +$contextpage=array('groupcard','globalcard'); +$hookmanager->initHooks($contextpage); /** diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 6f89e49af5e..5de81b1dd26 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -71,16 +71,10 @@ $object->fetch($id, '', '', 1); $object->getrights(); $entity=$conf->entity; -if (! empty($conf->multicompany->enabled)) -{ - if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) - $entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity); - else - $entity=(! empty($object->entity) ? $object->entity : $conf->entity); -} // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','globalcard'); +$hookmanager->initHooks($contextpage); /**