chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

added link active for menu social network - partial CT#446

Browse Source
skala
Cristian Fasanando 16 years ago
parent 62cfd7d890
commit 1e9d46fc6a
19 changed files with 216 additions and 167 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      main/css/blue_lagoon/default.css
  2. 28
      main/inc/lib/group_portal_manager.lib.php
  3. 24
      main/inc/lib/online.inc.php
  4. 70
      main/inc/lib/social.lib.php
  5. 9
      main/messages/inbox.php
  6. 4
      main/messages/new_message.php
  7. 4
      main/messages/outbox.php
  8. 24
      main/messages/view_message.php
  9. 2
      main/social/friends.php
  10. 4
      main/social/group_add.php
  11. 6
      main/social/group_edit.php
  12. 6
      main/social/group_invitation.php
  13. 13
      main/social/group_members.php
  14. 39
      main/social/group_waiting_list.php
  15. 10
      main/social/groups.php
  16. 9
      main/social/home.php
  17. 2
      main/social/invitations.php
  18. 18
      main/social/profile.php
  19. 2
      main/social/search.php

7
main/css/blue_lagoon/default.css
Unescape View File

@ -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 {

28
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -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 '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('NewTopic').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('InviteFriends').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'menu_active':'menuTex4').'" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'menu_active':'menuTex4').'" >'.get_lang('InviteFriends').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'"><span class="menuTex4" >'.get_lang('LeaveGroup').'</span></a></li>';
break;
case GROUP_USER_PERMISSION_ADMIN:
//echo get_lang('IamAnAdmin');
echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('NewTopic').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_edit.php?id='.$group_id.'">'. Display::return_icon('edit.gif', get_lang('EditGroup'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('EditGroup').'</span></a></li>';
echo '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('MemberList').'</span></a></li>';
if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('WaitingList').'</span></a></li>';
}
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('InviteFriends').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'menu_active':'menuTex4').'" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_edit.php?id='.$group_id.'">'. Display::return_icon('edit.gif', get_lang('EditGroup'), array('hspace'=>'6')).'<span class="'.($show=='group_edit'?'menu_active':'menuTex4').'" >'.get_lang('EditGroup').'</span></a></li>';
echo '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'menu_active':'menuTex4').'" >'.get_lang('MemberList').'</span></a></li>';
//if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).'<span class="'.($show=='waiting_list'?'menu_active':'menuTex4').'" >'.get_lang('WaitingList').'</span></a></li>';
//}
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'menu_active':'menuTex4').'" >'.get_lang('InviteFriends').'</span></a></li>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'"><span class="menuTex4" >'.get_lang('YouHaveBeenInvitedJoinNow').'</span></a></li>';
@ -916,12 +916,12 @@ class GroupPortalManager
case GROUP_USER_PERMISSION_MODERATOR:
//echo get_lang('IamAModerator');
echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('NewTopic').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('MemberList').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'menu_active':'menuTex4').'" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('coachs.gif', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'menu_active':'menuTex4').'" >'.get_lang('MemberList').'</span></a></li>';
if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('WaitingList').'</span></a></li>';
echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'. Display::return_icon('group_na.gif', get_lang('WaitingList'), array('hspace'=>'6')).'<span class="'.($show=='waiting_list'?'menu_active':'menuTex4').'" >'.get_lang('WaitingList').'</span></a></li>';
}
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('InviteFriends').'</span></a></li>';
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'menu_active':'menuTex4').'" >'.get_lang('InviteFriends').'</span></a></li>';
break;
default:
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'"><span class="menuTex4" >'.get_lang('JoinGroup').'</a></span></li>';

24
main/inc/lib/online.inc.php
Unescape View File

@ -122,26 +122,48 @@ 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);
$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) {
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."' ";
}
}
}
$result = @Database::query($query,__FILE__,__LINE__);
if (count($result)>0) {

70
main/inc/lib/social.lib.php
Unescape View File

@ -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 = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('CreateAgroup').'</span></a></li>';
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='group_add'?'menu_active':'menuTex4').'" >'.get_lang('CreateAgroup').'</span></a></li>';
} else {
// Only admins and teachers can create groups
if (api_is_allowed_to_edit(null,true)) {
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('CreateAgroup').'</span></a></li>';
$create_group_item = '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='group_add'?'menu_active':'menuTex4').'" >'.get_lang('CreateAgroup').'</span></a></li>';
}
}
@ -671,45 +672,48 @@ class SocialManager extends UserManager {
if ($show != 'shared_profile') {
echo '<div>
<ul>
<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Home').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Messages').'</span></a></li>';
if ($show == 'messages') {
<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="'.($show=='home'?'menu_active':'menuTex4').'" >'.get_lang('Home').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="'.($show=='messages'?'menu_active':'menuTex4').'" >'.get_lang('Messages').'</span></a></li>';
if (in_array($show,$show_messages)) {
echo '<ul class="social_menu_messages">';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Inbox').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="menuTex4" >'.get_lang('ComposeMessage').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Outbox').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_inbox'?'menu_active':'menuTex4').'" >'.get_lang('Inbox').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='messages_compose'?'menu_active':'menuTex4').'" >'.get_lang('ComposeMessage').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_outbox'?'menu_active':'menuTex4').'" >'.get_lang('Outbox').'</span></a></li>';
echo '</ul>';
}
if ($show == 'invitations') {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('mail.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Invitations').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('mail.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="'.($show=='invitations'?'menu_active':'menuTex4').'" >'.get_lang('Invitations').'</span></a></li>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('ViewMySharedProfile').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Friends').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Groups').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).'<span class="'.($show=='shared_profile'?'menu_active':'menuTex4').'" >'.get_lang('ViewMySharedProfile').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="'.($show=='friends'?'menu_active':'menuTex4').'" >'.get_lang('Friends').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="'.($show=='groups'?'menu_active':'menuTex4').'" >'.get_lang('Groups').'</span></a></li>';
if ($show == 'groups') {
if (in_array($show,$show_groups)) {
echo '<ul class="social_menu_groups">';
echo $create_group_item;
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.gif',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('MyGroups').'</span></a></li>';
echo '<li class="socialMenuSubLevel"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.gif',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'menu_active':'menuTex4').'" >'.get_lang('MyGroups').'</span></a></li>';
echo '</ul>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Search').'</span></a></li>
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).'<span class="'.($show=='search'?'menu_active':'menuTex4').'" >'.get_lang('Search').'</span></a></li>
</ul>
</div>';
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 '<div class="socialMenu" >';
if ($user_id != intval(api_get_user_id())) {
$user_info = api_get_user_info($user_id);
echo '<div><center><strong>'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</strong></center></div>';
}
//--- User image
echo '<div class="social-content-image">';
echo '<div class="social-background-content" style="width:80%;" ><center>';
@ -720,13 +724,14 @@ class SocialManager extends UserManager {
}
echo '</center></div>';
echo '</div>';
if ($show_full_profile) {
if ($show_full_profile && $user_id == intval(api_get_user_id())) {
echo '<div align="center" class="menuTitle" ><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></div>';
echo '<div>
<ul>
<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Home').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Messages').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('ViewMySharedProfile').'</span></a></li>
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'<span class="menu_active" >'.get_lang('ViewMySharedProfile').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Friends').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="menuTex4" >'.get_lang('Groups').'</span></a></li>';
echo '</ul></div>';
@ -765,7 +770,7 @@ class SocialManager extends UserManager {
echo '</div>';
}
*/
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;
@ -783,27 +788,28 @@ class SocialManager extends UserManager {
$course_list_code = array_unique_dimensional($course_list_code);
}
echo '<div align="center" class="menuTitle" ><span class="menuTex1">'.strtoupper(get_lang('Announcement')).'</span></div>';
echo '<div>';
echo '<ul>';
//-----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)) {
echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?cidReq='.$course['code'].'"'.Display::return_icon('valves.gif',get_lang('Announcements'),array('hspace'=>'6')).'<span class="menuTex4">'.$course_info['name'].' ('.$content['count'].')</span></a></li>';
$announcements[] = '<li><a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?cidReq='.$course['code'].'"'.Display::return_icon('valves.gif',get_lang('Announcements'),array('hspace'=>'6')).'<span class="menuTex4">'.$course_info['name'].' ('.$content['count'].')</span></a></li>';
}
}
if (!empty($announcements)) {
echo '<div align="center" class="menuTitle" ><span class="menuTex1">'.strtoupper(get_lang('Announcement')).'</span></div>';
echo '<div>';
echo '<ul>';
foreach ($announcements as $announcement) {
echo $announcement;
}
echo '</ul>';
echo '</div>';
}
}
}
echo '</div>';
}

9
main/messages/inbox.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -187,7 +187,7 @@ echo '<div id="inbox-wrapper">';
$id_content_right = 'socialContentRigth';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('messages');
SocialManager::show_social_menu('messages_inbox');
echo '</div>';
}
@ -206,7 +206,6 @@ echo '<div id="inbox-wrapper">';
inbox_display();
}
echo '</div>';
echo '</div>';
/*
@ -216,5 +215,3 @@ echo '</div>';
*/
Display::display_footer();
?>

4
main/messages/new_message.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -324,7 +324,7 @@ echo '<div id="inbox-wrapper" >';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('messages');
SocialManager::show_social_menu('messages_compose');
echo '</div>';
$id_content_right = 'socialContentRigth';
}

4
main/messages/outbox.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -152,7 +152,7 @@ echo '<div id="inbox-wrapper">';
$id_content_right = 'socialContentRigth';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('messages');
SocialManager::show_social_menu('messages_outbox');
echo '</div>';
}

24
main/messages/view_message.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -66,6 +66,15 @@ if ($_GET['f']=='social') {
}
echo '<div id="inbox-wrapper">';
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 '<div id="inbox-wrapper">';
$id_content_right = 'socialContentRigth';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('messages');
SocialManager::show_social_menu($show_menu);
echo '</div>';
}
echo '<div id="'.$id_content_right.'">';
//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();
}

2
main/social/friends.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>

4
main/social/group_add.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -117,7 +117,7 @@ echo '</div>';
echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//show the action menu
SocialManager::show_social_menu('groups');
SocialManager::show_social_menu('group_add');
echo '</div>';
echo '<div id="socialContentRigth">';
$form->display();

6
main/social/group_edit.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -178,9 +178,9 @@ if ($image == '') {
echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('group_messages',$group_id);
SocialManager::show_social_menu('group_edit',$group_id);
echo '</div>';
echo '<div class="socialContentRight">';
echo '<div id="socialContentRigth">';
// Display form
$form->display();
echo '</div>';

6
main/social/group_invitation.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -341,10 +341,10 @@ if ($add_type == 'multiple') {
echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('group_messages',$group_id);
SocialManager::show_social_menu('invite_friends',$group_id);
echo '</div>';
echo '<div class="socialContentRight">';
echo '<div id="socialContentRigth">';
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $group_id; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>

13
main/social/group_members.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -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 '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('group_messages',$group_id);
SocialManager::show_social_menu('member_list',$group_id);
echo '</div>';
echo '<div class="socialContentRight">';
echo '<div id="socialContentRigth">';
if (! empty($show_message)){
Display :: display_normal_message($show_message);
}
foreach($users as $user) {
switch ($user['relation_type']) {
case GROUP_USER_PERMISSION_ADMIN:

39
main/social/group_waiting_list.php
Unescape View File

@ -39,10 +39,23 @@ 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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="menuTex1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
/*
echo '<div class="menuTitle" align="center"><span class="menuTex1">'.get_lang('Menu').'</span></div>';
echo '<div class="TitleRigth">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="menuTex1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('GroupWaitingList');
echo '</div>';
*/
// Group information
$admins = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN), 0, 1000);
@ -79,21 +92,20 @@ 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 '<div id="layout_right" style="margin-left: 282px;">';
//echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu('waiting_list',$group_id);
echo '</div>';
echo '<div id="socialContentRigth">';
if (!empty($show_message)){
Display :: display_normal_message($show_message);
}
// Display form
foreach($users as $user) {
switch ($user['relation_type']) {
@ -111,8 +123,9 @@ echo '<div id="layout_right" style="margin-left: 282px;">';
} else {
Display :: display_normal_message(get_lang('ThereAreNotUsersInTheWaitingList'));
}
echo '</div>';
echo '</div>';
echo '</div>'; // end layout right
Display :: display_footer();
?>

10
main/social/groups.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>
@ -147,9 +147,13 @@ echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//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 '</div>';

9
main/social/home.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
@ -70,9 +70,9 @@ echo '<div id="socialContent">';
echo '<div id="socialContentLeft">';
//this include the social menu div
SocialManager::show_social_menu();
SocialManager::show_social_menu('home');
echo '</div>';
echo '<div class="socialContentRight">';
echo '<div id="socialContentRigth">';
echo '<div id="boxmyGroups">';
echo '<div id="boxmyGroupsLeft">';
@ -90,6 +90,8 @@ echo '<div id="socialContent">';
</div>
</div>';
if (count($user_online_list) > 0) {
echo '<div class="boxMygroupsContent">
<div>'.Display::return_icon('boxmygroups.jpg').'</div>
<div class="myGroupsContent">
@ -99,6 +101,7 @@ echo '<div id="socialContent">';
echo '</div>
</div>
</div>';
}
echo '</div>';

2
main/social/invitations.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>

18
main/social/profile.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.$title.'</span></center></td>
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.get_lang('ViewMySharedProfile').'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="menuTex1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
/*
@ -503,7 +497,10 @@ echo '<div id="socialContentRigth">';
$item_name = '<div class="box_shared_profile_group_title">'.strtoupper($name). $icon.'</div>';
$item_description = '<div class="box_shared_profile_group_description">'.get_lang('DescriptionGroup').'<p>'.cut($result['description'],120,true).'</p></div>';
$result['picture_uri'] = '<div class="box_shared_profile_group_image"><img class="imageGroups" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" /></div>';
$item_actions = '';
if (api_get_user_id() == $user_id) {
$item_actions = '<div class="box_shared_profile_group_actions"><a href="groups.php?id='.$id.'">'.get_lang('SeeMore').$url_close.'</div>';
}
$grid_my_groups[]= array($item_name,$url_open.$result['picture_uri'].$url_close, $item_description.$item_actions);
$i++;
}
@ -522,9 +519,11 @@ echo '<div id="socialContentRigth">';
$count_groups = count($results).' '.get_lang('Groups');
}
echo '<div>'.$count_groups.'</div>';
if (api_get_user_id() == $user_id) {
if ($i > $max_numbers_of_group) {
echo '<div class="box_shared_profile_group_actions"><a href="groups.php?view=mygroups">'.get_lang('SeeAllMyGroups').'</a></div>';
}
}
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 '</div>';
echo '</div>';
@ -584,7 +583,6 @@ echo '<div id="socialContentRigth">';
}
}
//--Productions
$production_list = UserManager::build_production_list($user_id);
// Images uploaded by course
@ -665,7 +663,6 @@ echo '<div id="socialContentRigth">';
echo '</div>';
echo '<br />';
}
if (!empty($user_info['diplomas'])) {
echo '<div class="social-background-content" style="width:100%;" >';
echo '<div class="social-actions-message"><strong>'.get_lang('MyDiplomas').'</strong></div>';
@ -688,7 +685,6 @@ echo '<div id="socialContentRigth">';
echo '<br />';
}
echo '</div>';
echo '</div>';
echo '</div>';
}

2
main/social/search.php
Unescape View File

@ -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 '<div class="actions-title-groups">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="menuTex1">'.strtoupper(get_lang('Menu')).'</span></center></td>

Write Preview
Loading…
Cancel
Save