From 197e963bdca33226a0c598530b651129bf9e89c5 Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Tue, 12 Jan 2010 09:30:19 -0500 Subject: [PATCH] added count invitations into menu social network - partial CT#462 --- main/inc/lib/social.lib.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index feba03530b..3ebd876b3a 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -661,9 +661,16 @@ class SocialManager extends UserManager { $show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list'); $show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose'); - $count_unread_message = MessageManager::get_number_of_messages(true); + // get count unread message and total invitations + $count_unread_message = MessageManager::get_number_of_messages(true); $count_unread_message = (!empty($count_unread_message)?' ('.$count_unread_message.')':''); + + $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)?' ('.$total_invitations.')':''); // Everybody can create groups if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { @@ -738,7 +745,7 @@ class SocialManager extends UserManager { } //Invitations - echo '
  • '.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).''.get_lang('Invitations').'
    • '; + echo '
  • '.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).''.get_lang('Invitations').$total_invitations.'
    • '; echo '
  • '.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).''.get_lang('ViewMySharedProfile').'
  • '.Display::return_icon('friend.png',get_lang('Friends'),array('hspace'=>'6')).''.get_lang('Friends').'
  • '.Display::return_icon('group.png',get_lang('Groups'),array('hspace'=>'6')).''.get_lang('Groups').'
    • '; @@ -769,7 +776,7 @@ class SocialManager extends UserManager { echo '
  • '.Display::return_icon('home.png',get_lang('Home'),array('hspace'=>'6')).'
  • '.Display::return_icon('instant_message.png',get_lang('Messages'),array('hspace'=>'6')).'
    • '; - echo '
  • '.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).''.get_lang('Invitations').'
    • '; + echo '
  • '.Display::return_icon('invitation.png',get_lang('Invitations'),array('hspace'=>'6')).''.get_lang('Invitations').$total_invitations.'
    • '; echo '
  • '.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'
  • '.Display::return_icon('friend.png',get_lang('Friends'),array('hspace'=>'6')).'
  • '.Display::return_icon('group.png',get_lang('Groups'),array('hspace'=>'6')).'
    • '; @@ -782,14 +789,14 @@ class SocialManager extends UserManager { if ($user_id != api_get_user_id()) { echo '
  • '; - echo Display::return_icon('message_new.png',get_lang('SendMessage')).'  '.get_lang('SendMessage').'
    • '; + echo Display::return_icon('compose_message.png',get_lang('SendMessage')).'  '.get_lang('SendMessage').''; } //check if I already sent an invitation message $invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id()); if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) { - echo '
  • '.Display::return_icon('mail_send.png',get_lang('YouAlreadySentAnInvitation')).'  '.get_lang('YouAlreadySentAnInvitation').'
    • '; + echo '
  • '.Display::return_icon('invitation.png',get_lang('YouAlreadySentAnInvitation')).'  '.get_lang('YouAlreadySentAnInvitation').'
    • '; } else { if (!$show_full_profile) { echo '
  • '.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).' '.get_lang('SendInvitation').'
    • ';