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

User picture: Fix wrong image displayed on other users without a contact

Browse Source
This commit is contained in:
Molkobain
2021-03-26 10:01:00 +01:00
parent ba33cf98e3
commit 9312fdb573
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,6 +655,8 @@ class UserRights
const DEFAULT_CONTACT_PICTURE_ATTCODE = 'picture';
public static $m_aCacheUsers;
/** @var array Associative array of user's ID => user's picture URL */
protected static $m_aCacheContactPictureAbsUrl = [];
/** @var UserRightsAddOnAPI $m_oAddOn */
protected static $m_oAddOn;
protected static $m_oUser;
@@ -1070,8 +1072,14 @@ class UserRights
public static function GetUserPictureAbsUrl($sLogin = '', $bAllowDefaultPicture = true)
{
$sUserPicturesFolder = 'images/user-pictures/';
$sUserPicturePlaceholderPrefKey = 'user_picture_placeholder';
// First, the default picture
// 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 {
@@ -1107,12 +1115,15 @@ class UserRights
}
} // If no contact, check if user has a placeholder in they preferences
else {
$sPlaceholderPictureFilename = appUserPreferences::GetPref('user_picture_placeholder', null);
$sPlaceholderPictureFilename = appUserPreferences::GetPref($sUserPicturePlaceholderPrefKey, null, static::GetUserId($sLogin));
if (!empty($sPlaceholderPictureFilename)) {
$sPictureUrl = utils::GetAbsoluteUrlAppRoot().$sUserPicturesFolder.$sPlaceholderPictureFilename;
}
}
// Update cache
static::$m_aCacheContactPictureAbsUrl[$sLogin] = $sPictureUrl;
return $sPictureUrl;
}