From 16b49b828cc07de57c2b1b2a6dae65a40b485f98 Mon Sep 17 00:00:00 2001 From: lainwir3d Date: Sat, 30 Apr 2022 15:59:22 +0400 Subject: [PATCH] Revert "Oine external user login quick fix." This reverts commit 37f7c86b3cdb873d1e369ab86f8e83a23dba886e. --- htdocs/user/class/api_users.class.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php index f835c7d624f..66d842c3564 100644 --- a/htdocs/user/class/api_users.class.php +++ b/htdocs/user/class/api_users.class.php @@ -152,8 +152,7 @@ class Users extends DolibarrApi */ public function get($id, $includepermissions = 0) { - if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin) && - !(!empty(DolibarrApiAccess::$user->rights->user->self->creer) && (DolibarrApiAccess::$user->id == $id))) { + if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin) && $id != 0 && DolibarrApiAccess::$user->id != $id) { throw new RestException(401, 'Not allowed'); } @@ -174,7 +173,6 @@ class Users extends DolibarrApi $this->useraccount->getRights(); } - $this->useraccount->societe_id = $this->useraccount->socid; return $this->_cleanObjectDatas($this->useraccount); } @@ -296,8 +294,6 @@ class Users extends DolibarrApi $this->useraccount->user_group_list = $this->_cleanUserGroupListDatas($userGroupList); - $this->useraccount->societe_id = $this->useraccount->socid; - //var_dump($this->useraccount); die(); return $this->_cleanObjectDatas($this->useraccount); }