composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

🎨 cleanup code

Browse Source
This commit is contained in:
Eric
2021-07-28 09:59:10 +02:00
parent 54a6573948
commit 8dc10424e8
2 changed files with 122 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/userrights.class.inc.php
View File

@@ -380,7 +380,7 @@ abstract class User extends cmdbAbstractObject
// Check if the user is yet allowed to modify Users
if (method_exists($oAddon, 'ResetCache')) {
$aCurrentProfiles = $_SESSION['profile_list'];
$aCurrentProfiles = $_SESSION['profile_list'] ?? null;
// Set the current profiles into a session variable (not yet in the database)
$_SESSION['profile_list'] = $aProfiles;
@@ -390,7 +390,11 @@ abstract class User extends cmdbAbstractObject
}
$oAddon->ResetCache();
$_SESSION['profile_list'] = $aCurrentProfiles;
if (is_null($aCurrentProfiles)) {
unset($_SESSION['profile_list']);
} else {
$_SESSION['profile_list'] = $aCurrentProfiles;
}
}
}
}
@@ -594,6 +598,9 @@ abstract class User extends cmdbAbstractObject
*/
private function IsCurrentUser(): bool
{
if (is_null(UserRights::GetUserId())) {
return false;
}
return UserRights::GetUserId() == $this->GetKey();
}
}