merge

main/inc/lib/social.lib.php

@@ -574,7 +574,18 @@ class SocialManager extends UserManager
 
         $show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list', 'browse_groups');
 
-        $html = '';
+        // get count unread message and total invitations
+        $count_unread_message = MessageManager::get_number_of_messages(true);
+        $count_unread_message = !empty($count_unread_message) ? Display::badge($count_unread_message) : null;
+
+        $number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(api_get_user_id());
+        $group_pending_invitations = GroupPortalManager::get_groups_by_user(api_get_user_id(), GROUP_USER_PERMISSION_PENDING_INVITATION, false);
+        $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)) {
             //--- Group image
             $group_info = GroupPortalManager::get_group_data($group_id);
@@ -591,7 +602,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

@@ -18,6 +18,7 @@ if (api_get_setting('allow_social_tool') !='true') {
 }
 
 $user_id = api_get_user_id();
+$isAdmin = api_is_platform_admin($user_id);
 
 $show_full_profile = true;
 //social tab
@@ -65,6 +66,13 @@ if (isset($_GET['u'])) {
 } else {
     $user_info    = UserManager::get_user_info_by_id($user_id);
 }
+
+if ($user_info['user_id'] == api_get_user_id()) {
+    $isSelfUser = true;
+} 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';
@@ -315,12 +323,14 @@ if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) {
 
 if ($show_full_profile) {
     $personal_info .=  '<dl class="dl-horizontal">';
-    $personal_info .=  '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].'    </dd>';
+    if ($isAdmin || $isSelfUser) {
+        $personal_info .=  '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].'    </dd>';
+    }
     if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) {
         $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'])) {
@@ -335,7 +345,9 @@ if ($show_full_profile) {
 } else {
     $personal_info .=  '<dl class="dl-horizontal">';
     if (!empty($user_info['username'])) {
-        $personal_info .=  '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].'</dd>';
+        if ($isAdmin || $isSelfUser) {
+            $personal_info .=  '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].'</dd>';
+        }
     }
     $personal_info .=  '</dl>';
 }

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 {