FIX only a superadmin can modify entity

This commit is contained in:
Regis Houssin 2021-11-11 17:48:23 +01:00
parent 564badc61b
commit 5eff0e7a0c

View File

@ -448,23 +448,15 @@ if (empty($reshook)) {
$object->lang = GETPOST('default_lang', 'aZ09'); $object->lang = GETPOST('default_lang', 'aZ09');
// Do we update also ->entity ? // Do we update also ->entity ?
if (!empty($conf->multicompany->enabled)) { // If multicompany is not enabled, we never update the entity of a user. if (!empty($conf->multicompany->enabled && $user->entity == 0 && !empty($user->admin))) { // If multicompany is not enabled, we never update the entity of a user.
if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { if (GETPOST('superadmin', 'int')) {
if (GETPOST('superadmin', 'int')) { $object->entity = 0;
$object->entity = 0;
} else {
$object->entity = 1; // all users are in master entity
}
} else { } else {
// A user should not be able to move a user into another entity. Only superadmin should be able to do this. if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
if ($user->entity == 0 && $user->admin) { $object->entity = 1; // all users are in master entity
if (GETPOST('superadmin', 'int')) { } else {
// We try to set the user as superadmin. // We try to change the entity of user
$object->entity = 0; $object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $object->entity);
} else {
// We try to change the entity of user
$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $object->entity);
}
} }
} }
} }