Hide offline user image from profile - refs #7269

main/inc/lib/social.lib.php

@@ -601,6 +601,7 @@ class SocialManager extends UserManager
         $group_pending_invitations = count($group_pending_invitations);
         $total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
         $total_invitations = (!empty($total_invitations) ? Display::badge($total_invitations) : '');
+        $showUserImage = user_is_online($user_id) || api_is_platform_admin();
 
         $html = '<div class="social-menu">';
         if (in_array($show, $show_groups) && !empty($group_id)) {
@@ -619,7 +620,11 @@ class SocialManager extends UserManager
             $html .= '</div>';
             $html .= '</div>';
         } else {
-            $img_array = UserManager::get_user_picture_path_by_id($user_id, 'web', true, true);
+            if ($showUserImage) {
+                $img_array = UserManager::get_user_picture_path_by_id($user_id, 'web', true, true);
+            } else {
+                $img_array = UserManager::get_user_picture_path_by_id(null, 'web', true, true);
+            }
             $big_image = UserManager::get_picture_user($user_id, $img_array['file'], '', USER_IMAGE_SIZE_BIG);
             $big_image = $big_image['file'].'?'.uniqid();
             $normal_image = $img_array['dir'].$img_array['file'].'?'.uniqid();

main/social/profile.php

@@ -72,6 +72,7 @@ if ($user_info['user_id'] == api_get_user_id()) {
 } else {
     $isSelfUser = false;
 }
+$userIsOnline = user_is_online($user_id);
 $libpath = api_get_path(LIBRARY_PATH);
 require_once api_get_path(SYS_CODE_PATH).'calendar/myagenda.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php';
@@ -328,7 +329,7 @@ if ($show_full_profile) {
         $personal_info .=  '<dt>'.get_lang('Name')
             .'</dt><dd>'. api_get_person_name($user_info['firstname'], $user_info['lastname']).'</dd>';
     }
-    if (!empty($user_info['official_code'])) {
+    if (($isAdmin || $isSelfUser) && !empty($user_info['official_code'])) {
         $personal_info .=  '<dt>'.get_lang('OfficialCode').'</dt><dd>'.$user_info['official_code'].'</dd>';
     }
     if (!empty($user_info['email'])) {

whoisonline.php

@@ -138,7 +138,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
     }
 
     if (isset($_GET['id'])) {
-        if (api_get_setting('allow_social_tool') == 'true') {
+        if (api_get_setting('allow_social_tool') == 'true' && api_user_is_login()) {
             header("Location: ".api_get_path(WEB_CODE_PATH)."social/profile.php?u=".intval($_GET['id']));
             exit;
         } else {