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

N°7565 - Refactor way of retrieving user's picture

Browse Source
This commit is contained in:
Molkobain
2024-06-19 11:05:46 +02:00
parent 6e2ed188eb
commit 51adfd0254
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1264,19 +1264,13 @@ class UserRights
{
$sUserPicturesFolder = 'images/user-pictures/';
$sUserPicturePlaceholderPrefKey = 'user_picture_placeholder';
$sPictureUrl = null;
// First, check cache
if (array_key_exists($sLogin, static::$m_aCacheContactPictureAbsUrl)) {
return static::$m_aCacheContactPictureAbsUrl[$sLogin];
}
// Then, the default picture
if ($bAllowDefaultPicture === true) {
$sPictureUrl = utils::GetAbsoluteUrlAppRoot().$sUserPicturesFolder.'user-profile-default-256px.png';
} else {
$sPictureUrl = null;
}
// Then check if the user has a contact attached and if it has an picture defined
$sContactId = UserRights::GetContactId($sLogin);
if (!empty($sContactId)) {
@@ -1323,6 +1317,11 @@ class UserRights
}
// Else, no contact and no login, then it's for an unknown origin (system, extension, ...)
// Then, the default picture
if (utils::IsNullOrEmptyString($sPictureUrl) && $bAllowDefaultPicture === true) {
$sPictureUrl = utils::GetAbsoluteUrlAppRoot().$sUserPicturesFolder.'user-profile-default-256px.png';
}
// Update cache
static::$m_aCacheContactPictureAbsUrl[$sLogin] = $sPictureUrl;

5
sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -454,10 +454,7 @@ JS;
protected function ComputeUserData()
{
// Use a picture set in the preferences is there is none in the user's contact
$sPictureUrl = UserRights::GetUserPictureAbsUrl('', false);
if (empty($sPictureUrl)) {
$sPictureUrl = utils::GetAbsoluteUrlAppRoot().'images/user-pictures/'.appUserPreferences::GetPref('user_picture_placeholder', 'user-profile-default-256px.png');
}
$sPictureUrl = UserRights::GetUserPictureAbsUrl();
// TODO 3.0.0 : what do we show if no contact is linked to the user ?
$aData = [