From 1e9d46fc6a3d9f643a4f11e5dbedad5df6bebdda Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Thu, 31 Dec 2009 11:41:56 -0500 Subject: [PATCH] added link active for menu social network - partial CT#446 --- main/css/blue_lagoon/default.css | 7 ++ main/inc/lib/group_portal_manager.lib.php | 28 +++---- main/inc/lib/online.inc.php | 40 +++++++--- main/inc/lib/social.lib.php | 96 ++++++++++++----------- main/messages/inbox.php | 11 +-- main/messages/new_message.php | 4 +- main/messages/outbox.php | 4 +- main/messages/view_message.php | 26 +++--- main/social/friends.php | 2 +- main/social/group_add.php | 4 +- main/social/group_edit.php | 6 +- main/social/group_invitation.php | 6 +- main/social/group_members.php | 13 +-- main/social/group_waiting_list.php | 75 ++++++++++-------- main/social/groups.php | 10 ++- main/social/home.php | 11 ++- main/social/invitations.php | 2 +- main/social/profile.php | 36 ++++----- main/social/search.php | 2 +- 19 files changed, 216 insertions(+), 167 deletions(-) diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index b3678ee2d1..3332dbaa9c 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -3235,6 +3235,13 @@ a.unread { font-size:12px; } +.menu_active{ + font-family:Verdana, Geneva, sans-serif; + color:#000; + font-weight:bold; + font-size:12px; + } + /* BOX SHARED PROFILE */ .boxProfile { diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php index 0a78433373..199f8519dd 100755 --- a/main/inc/lib/group_portal_manager.lib.php +++ b/main/inc/lib/group_portal_manager.lib.php @@ -861,7 +861,7 @@ class GroupPortalManager * @param int user id * */ - public static function show_group_column_information($group_id, $user_id) { + public static function show_group_column_information($group_id, $user_id, $show = '') { $group_info = GroupPortalManager::get_group_data($group_id); $picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_'); @@ -892,20 +892,20 @@ class GroupPortalManager // I'm just a reader //echo get_lang('IamAReader'); echo '
  • '.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).''.get_lang('NewTopic').'
    • '; - echo '
  • '. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; - echo '
  • '. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; + echo '
  • '. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; + echo '
  • '. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; echo '
  • '.get_lang('LeaveGroup').'
    • '; break; case GROUP_USER_PERMISSION_ADMIN: //echo get_lang('IamAnAdmin'); echo '
  • '.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).''.get_lang('NewTopic').'
    • '; - echo '
  • '. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; - echo '
  • '. Display::return_icon('edit.gif', get_lang('EditGroup'), array('hspace'=>'6')).''.get_lang('EditGroup').'
    • '; - echo '
  • '. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; - if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) { - echo '
  • '. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).''.get_lang('WaitingList').'
    • '; - } - echo '
  • '. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; + echo '
  • '. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; + echo '
  • '. Display::return_icon('edit.gif', get_lang('EditGroup'), array('hspace'=>'6')).''.get_lang('EditGroup').'
    • '; + echo '
  • '. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; + //if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) { + echo '
  • '. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).''.get_lang('WaitingList').'
    • '; + //} + echo '
  • '. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; break; case GROUP_USER_PERMISSION_PENDING_INVITATION: echo '
  • '.get_lang('YouHaveBeenInvitedJoinNow').'
    • '; @@ -916,12 +916,12 @@ class GroupPortalManager case GROUP_USER_PERMISSION_MODERATOR: //echo get_lang('IamAModerator'); echo '
  • '.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).''.get_lang('NewTopic').'
    • '; - echo '
  • '. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; - echo '
  • '. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; + echo '
  • '. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; + echo '
  • '. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) { - echo '
  • '. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).''.get_lang('WaitingList').'
    • '; + echo '
  • '. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).''.get_lang('WaitingList').'
    • '; } - echo '
  • '. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; + echo '
  • '. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; break; default: echo '
  • '.get_lang('JoinGroup').'
    • '; diff --git a/main/inc/lib/online.inc.php b/main/inc/lib/online.inc.php index 93aeaab08e..8057364100 100755 --- a/main/inc/lib/online.inc.php +++ b/main/inc/lib/online.inc.php @@ -122,24 +122,46 @@ function LoginDelete($user_id) /** * Gives a list of people online now (and in the last $valid minutes) * @param int Number of minutes to account logins for + * @param bool optionally if it's set to true shows who friends from social network is online otherwise just shows all users online * @return array For each line, a list of user IDs and login dates, or FALSE on error or empty results */ -function WhoIsOnline($valid) +function WhoIsOnline($valid, $friends = false) { $valid = (int) $valid; $current_date=date('Y-m-d H:i:s',time()); $track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLINE); - $query = "SELECT login_user_id,login_date FROM ".$track_online_table ." WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' "; - + $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_FRIEND); + $query = ''; + if ($friends) { + // who friends from social network is online + $query = " SELECT distinct login_user_id,login_date + FROM $track_online_table + INNER JOIN $friend_user_table ON friend_user_id = login_user_id AND relation_type=3 + WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' "; + } else { + // all users online + $query = "SELECT login_user_id,login_date FROM ".$track_online_table ." WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' "; + } + global $_configuration; if ($_configuration['multiple_access_urls']==true) { $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); - $access_url_id = api_get_current_access_url_id(); - if ($access_url_id != -1){ - $query = "SELECT login_user_id,login_date FROM ".$track_online_table ." track - INNER JOIN $tbl_user_rel_access_url user_rel_url - ON (user_rel_url.user_id = track.login_user_id) - WHERE access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' "; + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + if ($friends) { + // who friends from social network is online + $query = " SELECT distinct login_user_id,login_date + FROM $track_online_table + INNER JOIN $tbl_user_rel_access_url user_rel_url ON (user_rel_url.user_id = track.login_user_id) + INNER JOIN $friend_user_table ON friend_user_id = login_user_id AND relation_type=3 + WHERE access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' "; + } else { + // all users online + $query = " SELECT login_user_id,login_date FROM ".$track_online_table ." track + INNER JOIN $tbl_user_rel_access_url user_rel_url + ON (user_rel_url.user_id = track.login_user_id) + WHERE access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' "; + } } } diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index e94f5ba1da..981749b508 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -656,14 +656,15 @@ class SocialManager extends UserManager { $img_array= UserManager::get_user_picture_path_by_id($user_id,'web',true,true); $big_image = UserManager::get_picture_user($user_id, $img_array['file'],'',USER_IMAGE_SIZE_BIG); $big_image = $big_image['file'].$big_image['dir']; - + $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'); // Everybody can create groups if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { - $create_group_item = '
  • '.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).''.get_lang('CreateAgroup').'
    • '; + $create_group_item = '
  • '.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6','style'=>'float:left')).''.get_lang('CreateAgroup').'
    • '; } else { // Only admins and teachers can create groups if (api_is_allowed_to_edit(null,true)) { - $create_group_item = '
  • '.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).''.get_lang('CreateAgroup').'
    • '; + $create_group_item = '
  • '.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6','style'=>'float:left')).''.get_lang('CreateAgroup').'
    • '; } } @@ -671,46 +672,49 @@ class SocialManager extends UserManager { if ($show != 'shared_profile') { echo '
    '; - if ($show == 'group_messages' && !empty($group_id)) { - echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id()); + if (in_array($show,$show_groups) && !empty($group_id)) { + echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id(), $show); } } if ($show == 'shared_profile') { - //echo '
    '; - //--- User image + if ($user_id != intval(api_get_user_id())) { + $user_info = api_get_user_info($user_id); + echo '
    '.api_get_person_name($user_info['firstName'], $user_info['lastName']).'
    '; + } + //--- User image echo ''; - if ($show_full_profile) { + + if ($show_full_profile && $user_id == intval(api_get_user_id())) { echo '
    '.strtoupper(get_lang('Menu')).'
    '; echo '
    '; @@ -765,7 +770,7 @@ class SocialManager extends UserManager { echo '
    '; } */ - if ($show_full_profile) { + if ($show_full_profile && $user_id == intval(api_get_user_id())) { $personal_course_list = UserManager::get_personal_session_course_list($user_id); $course_list_code = array(); $i=1; @@ -782,28 +787,29 @@ class SocialManager extends UserManager { //to avoid repeted courses $course_list_code = array_unique_dimensional($course_list_code); } - - echo '
    '.strtoupper(get_lang('Announcement')).'
    '; - echo '
    '; - echo ''; - echo '
    '; + + //-----Announcements + $my_announcement_by_user_id= intval($user_id); + $announcements = array(); + foreach ($course_list_code as $course) { + $content = get_all_annoucement_by_user_course($course['dbName'],$my_announcement_by_user_id); + $course_info=api_get_course_info($course['code']); + if (!empty($content)) { + $announcements[] = '
  • '6')).''.$course_info['name'].' ('.$content['count'].')
    • '; + } + } + if (!empty($announcements)) { + echo '
    '.strtoupper(get_lang('Announcement')).'
    '; + echo '
    '; + echo ''; + echo '
    '; + } } - - - - } - echo ''; } @@ -1033,4 +1039,4 @@ class SocialManager extends UserManager { } return $content; } -} \ No newline at end of file +} diff --git a/main/messages/inbox.php b/main/messages/inbox.php index c42ead749c..68f93bee2d 100755 --- a/main/messages/inbox.php +++ b/main/messages/inbox.php @@ -135,8 +135,8 @@ if ($_GET['f']=='social') { Display::display_header(''); $social_parameter = ''; -if ($_GET['f']=='social') { - $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') { + $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo ' @@ -187,7 +187,7 @@ echo '
    '; $id_content_right = 'socialContentRigth'; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('messages'); + SocialManager::show_social_menu('messages_inbox'); echo '
    '; } @@ -206,7 +206,6 @@ echo '
    '; inbox_display(); } echo '
    '; - echo '
    '; /* @@ -215,6 +214,4 @@ echo ''; ============================================================================== */ -Display::display_footer(); - -?> +Display::display_footer(); \ No newline at end of file diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 69801259e9..9ff7d92968 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -277,7 +277,7 @@ if ($group_id != 0) { } else { if ($_GET['f']=='social') { - $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); + $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -324,7 +324,7 @@ echo '
    '; require_once api_get_path(LIBRARY_PATH).'social.lib.php'; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('messages'); + SocialManager::show_social_menu('messages_compose'); echo '
    '; $id_content_right = 'socialContentRigth'; } diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 5e6fb92e39..bd2caa7782 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -80,7 +80,7 @@ Display::display_header(''); if ($_GET['f']=='social') { - $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); + $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -152,7 +152,7 @@ echo '
    '; $id_content_right = 'socialContentRigth'; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('messages'); + SocialManager::show_social_menu('messages_outbox'); echo '
    '; } diff --git a/main/messages/view_message.php b/main/messages/view_message.php index be4f61a8e6..f681f78000 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -32,7 +32,7 @@ $interbreadcrumb[]= array ('url' => '#','name' => get_lang('View')); Display::display_header(''); if ($_GET['f']=='social') { - $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); + $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -65,7 +65,16 @@ if ($_GET['f']=='social') { } } -echo '
    '; +echo '
    '; + if (empty($_GET['id'])) { + $id_message = $_GET['id_send']; + $source = 'outbox'; + $show_menu = 'messages_outbox'; + } else { + $id_message = $_GET['id']; + $source = 'inbox'; + $show_menu = 'messages_inbox'; + } $id_content_right = ''; //LEFT COLUMN if (api_get_setting('allow_social_tool') != 'true') { @@ -82,25 +91,16 @@ echo '
    '; $id_content_right = 'socialContentRigth'; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('messages'); + + SocialManager::show_social_menu($show_menu); echo '
    '; } echo '
    '; //MAIN CONTENT - - if (empty($_GET['id'])) { - $id_message = $_GET['id_send']; - $source = 'outbox'; - } else { - $id_message = $_GET['id']; - $source = 'inbox'; - } $message = MessageManager::show_message_box($id_message,$source); if (!empty($message)) { echo $message; - - } else { api_not_allowed(); } diff --git a/main/social/friends.php b/main/social/friends.php index 69033b2aa9..58e5a1cbd3 100755 --- a/main/social/friends.php +++ b/main/social/friends.php @@ -88,7 +88,7 @@ $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Friends')); Display :: display_header($tool_name, 'Groups'); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    diff --git a/main/social/group_add.php b/main/social/group_add.php index 43dd45da3b..b6cd257399 100755 --- a/main/social/group_add.php +++ b/main/social/group_add.php @@ -98,7 +98,7 @@ $this_section = SECTION_SOCIAL; $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social')); Display :: display_header($tool_name, 'Groups'); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -117,7 +117,7 @@ echo ''; echo '
    '; echo '
    '; //show the action menu - SocialManager::show_social_menu('groups'); + SocialManager::show_social_menu('group_add'); echo '
    '; echo '
    '; $form->display(); diff --git a/main/social/group_edit.php b/main/social/group_edit.php index 8ca199b37d..90deb7b2c4 100755 --- a/main/social/group_edit.php +++ b/main/social/group_edit.php @@ -126,7 +126,7 @@ if ( $form->validate()) { Display::display_header($tool_name); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -178,9 +178,9 @@ if ($image == '') { echo '
    '; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('group_messages',$group_id); + SocialManager::show_social_menu('group_edit',$group_id); echo '
    '; - echo '
    '; + echo '
    '; // Display form $form->display(); echo '
    '; diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php index f093c0ec70..d1667d1282 100755 --- a/main/social/group_invitation.php +++ b/main/social/group_invitation.php @@ -212,7 +212,7 @@ $users=$sessions=array(); Display :: display_header($tool_name, 'Groups'); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -341,10 +341,10 @@ if ($add_type == 'multiple') { echo '
    '; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('group_messages',$group_id); + SocialManager::show_social_menu('invite_friends',$group_id); echo '
    '; - echo '
    '; + echo '
    '; ?>
    > diff --git a/main/social/group_members.php b/main/social/group_members.php index d6a50900b8..04b9472aff 100755 --- a/main/social/group_members.php +++ b/main/social/group_members.php @@ -38,7 +38,7 @@ if (empty($group_id)) { Display :: display_header($tool_name, 'Groups'); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    @@ -98,9 +98,7 @@ if (isset($_GET['action']) && $_GET['action']=='delete_moderator') { } } -if (! empty($show_message)){ - Display :: display_normal_message($show_message); -} + $users = GroupPortalManager::get_users_by_group($group_id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000); $new_member_list = array(); @@ -108,9 +106,12 @@ $new_member_list = array(); echo '
    '; echo '
    '; //this include the social menu div - SocialManager::show_social_menu('group_messages',$group_id); + SocialManager::show_social_menu('member_list',$group_id); echo '
    '; - echo '
    '; + echo '
    '; + if (! empty($show_message)){ + Display :: display_normal_message($show_message); + } foreach($users as $user) { switch ($user['relation_type']) { case GROUP_USER_PERMISSION_ADMIN: diff --git a/main/social/group_waiting_list.php b/main/social/group_waiting_list.php index fb2126de3f..c1bc16be0d 100755 --- a/main/social/group_waiting_list.php +++ b/main/social/group_waiting_list.php @@ -39,11 +39,24 @@ if (empty($group_id)) { Display :: display_header($tool_name, 'Groups'); -SocialManager::show_social_menu(); + +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); +$user_online_count = count($user_online_list); +echo '
    '; +echo '
    '.strtoupper(get_lang('Menu')).'
    + +
    '.strtoupper(get_lang('Menu')).'
    		 '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).''.get_lang('FriendsOnline').' '.$user_online_count.'
    '; +/* +echo '
    '.get_lang('Menu').'
    '; +echo '
    '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).''.$who_is_on_line.'
    '; +*/ +echo '
    '; +/* echo '
    '; echo get_lang('GroupWaitingList'); -echo '
    '; - +echo ''; +*/ + // Group information $admins = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN), 0, 1000); $show_message = ''; @@ -79,40 +92,40 @@ if (isset($_GET['action']) && $_GET['action']=='set_moderator') { } } - - -if (!empty($show_message)){ - Display :: display_normal_message($show_message); -} - $users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER), 0, 1000); $new_member_list = array(); //Shows left column -echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id()); - -//-- Show message groups -echo '
    '; - - // Display form - foreach($users as $user) { - switch ($user['relation_type']) { - case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER: - $user['link'] = ''.Display::return_icon('add_user.gif', get_lang('Accept')).''; - $user['link'] .= ''.Display::return_icon('add_teacher_big.gif', get_lang('Moderator')).''; - $user['link'] .= ''.Display::return_icon('delete.gif', get_lang('Deny')).''; - break; +//echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id()); +echo '
    '; + echo '
    '; + //this include the social menu div + SocialManager::show_social_menu('waiting_list',$group_id); + echo '
    '; + echo '
    '; + if (!empty($show_message)){ + Display :: display_normal_message($show_message); + } + // Display form + foreach($users as $user) { + switch ($user['relation_type']) { + case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER: + $user['link'] = ''.Display::return_icon('add_user.gif', get_lang('Accept')).''; + $user['link'] .= ''.Display::return_icon('add_teacher_big.gif', get_lang('Moderator')).''; + $user['link'] .= ''.Display::return_icon('delete.gif', get_lang('Deny')).''; + break; + } + $new_member_list[] = $user; } - $new_member_list[] = $user; - } - - if (count($new_member_list) > 0) { - Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true)); - } else { - Display :: display_normal_message(get_lang('ThereAreNotUsersInTheWaitingList')); - } + + if (count($new_member_list) > 0) { + Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true)); + } else { + Display :: display_normal_message(get_lang('ThereAreNotUsersInTheWaitingList')); + } + echo '
    '; +echo '
    '; -echo '
    '; // end layout right Display :: display_footer(); ?> \ No newline at end of file diff --git a/main/social/groups.php b/main/social/groups.php index e6fd6d5d2e..8377a5bce7 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -129,7 +129,7 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) { // getting group information $group_id = intval($_GET['id']); -$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline'))); +$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline'),true)); echo '
    '; echo ' @@ -147,9 +147,13 @@ echo '
    '; echo '
    '; //this include the social menu div if ($group_id != 0 ) { - SocialManager::show_social_menu('group_messages',$group_id); + SocialManager::show_social_menu('messages_list',$group_id); } else { - SocialManager::show_social_menu('groups'); + $show_menu = 'groups'; + if (isset($_GET['view']) && $_GET['view'] == 'mygroups') { + $show_menu = $_GET['view']; + } + SocialManager::show_social_menu($show_menu); } echo '
    '; diff --git a/main/social/home.php b/main/social/home.php index e194dec8b3..a6f3f08fee 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -52,7 +52,7 @@ if (api_get_setting('profile', 'picture') == 'true') { Display :: display_header(null); $user_info = UserManager :: get_user_info_by_id(api_get_user_id()); //$user_info = api_get_user_info(api_get_user_id()); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); echo '
    '; @@ -70,9 +70,9 @@ echo '
    '; echo '
    '; //this include the social menu div - SocialManager::show_social_menu(); + SocialManager::show_social_menu('home'); echo '
    '; - echo '
    '; + echo '
    '; echo '
    '; echo '
    '; @@ -89,6 +89,8 @@ echo '
    '; + + if (count($user_online_list) > 0) { echo '
    '.Display::return_icon('boxmygroups.jpg').'
    @@ -99,6 +101,7 @@ echo '
    '; echo '
    '; + } echo '
    '; @@ -160,4 +163,4 @@ echo '
    '; echo '
    '; echo '
    '; -Display :: display_footer(); \ No newline at end of file +Display :: display_footer(); diff --git a/main/social/invitations.php b/main/social/invitations.php index ac2cd78132..1dc0443a23 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -67,7 +67,7 @@ api_block_anonymous_users(); Display :: display_header($tool_name, 'Groups'); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'
    diff --git a/main/social/profile.php b/main/social/profile.php index 93c4ff1f4f..6a33bc1ffa 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -250,16 +250,10 @@ if (is_array($personal_course_list)) { //show the action menu //SocialManager::show_social_menu(); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); -//if ($user_id == api_get_user_id()) { - $title = get_lang('ViewMySharedProfile'); -/*} else { - $title = get_lang('ViewSharedProfile').' - '.api_get_person_name($user_info['firstname'], $user_info['lastname']); -} -*/ echo '
    '; -echo '
    '.strtoupper(get_lang('Menu')).'
    +echo '
    '.$title.'
    '.get_lang('ViewMySharedProfile').'
    		  '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).''.get_lang('FriendsOnline').' '.$user_online_count.'
    '; /* @@ -502,8 +496,11 @@ echo '
    '; $picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80); $item_name = '
    '.strtoupper($name). $icon.'
    '; $item_description = '
    '.get_lang('DescriptionGroup').'

    '.cut($result['description'],120,true).'

    '; - $result['picture_uri'] = '
    '; - $item_actions = '
    '.get_lang('SeeMore').$url_close.'
    '; + $result['picture_uri'] = '
    '; + $item_actions = ''; + if (api_get_user_id() == $user_id) { + $item_actions = '
    '.get_lang('SeeMore').$url_close.'
    '; + } $grid_my_groups[]= array($item_name,$url_open.$result['picture_uri'].$url_close, $item_description.$item_actions); $i++; } @@ -521,10 +518,12 @@ echo '
    '; } else { $count_groups = count($results).' '.get_lang('Groups'); } - echo '
    '.$count_groups.'
    '; - if ($i > $max_numbers_of_group) { - echo '
    '.get_lang('SeeAllMyGroups').'
    '; - } + echo '
    '.$count_groups.'
    '; + if (api_get_user_id() == $user_id) { + if ($i > $max_numbers_of_group) { + echo '
    '.get_lang('SeeAllMyGroups').'
    '; + } + } Display::display_sortable_grid('shared_profile_mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false)); echo '
    '; echo '
    '; @@ -583,8 +582,7 @@ echo '
    '; echo '
    '; } } - - + //--Productions $production_list = UserManager::build_production_list($user_id); // Images uploaded by course @@ -664,8 +662,7 @@ echo '
    '; echo cut($user_info['competences'],$cut_size); echo '
    '; echo '
    '; - } - + } if (!empty($user_info['diplomas'])) { echo ''; - + echo '
    '; echo ''; echo ''; } diff --git a/main/social/search.php b/main/social/search.php index 3621db3410..bd73d03607 100755 --- a/main/social/search.php +++ b/main/social/search.php @@ -21,7 +21,7 @@ $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social')); Display :: display_header($tool_name); -$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline')); +$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); echo '
    '; echo '
    '.strtoupper(get_lang('Menu')).'