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

Only allow friends to chat see #5264

Browse Source
skala
Julio Montoya 13 years ago
parent df6d9821e8
commit 3fb5d2fe6c
2 changed files with 73 additions and 62 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. 66
      main/inc/lib/chat.lib.php
  2. 55
      main/inc/lib/social.lib.php

66
main/inc/lib/chat.lib.php
Unescape View File

@ -173,38 +173,46 @@ class Chat extends Model {
* @return void Prints "1" * @return void Prints "1"
*/ */
function send($from_user_id, $to_user_id, $message) { function send($from_user_id, $to_user_id, $message) {
$user_info = api_get_user_info($to_user_id, true);
$this->save_window($to_user_id);
$_SESSION['openChatBoxes'][$to_user_id] = api_get_utc_datetime(); $user_friend_relation = SocialManager::get_relation_between_contacts($from_user_id, $to_user_id);
$messagesan = self::sanitize($message); if ($user_friend_relation == USER_RELATION_TYPE_FRIEND) {
if (!isset($_SESSION['chatHistory'][$to_user_id])) { $user_info = api_get_user_info($to_user_id, true);
$_SESSION['chatHistory'][$to_user_id] = array(); $this->save_window($to_user_id);
}
$item = array ( "s" => "1", $_SESSION['openChatBoxes'][$to_user_id] = api_get_utc_datetime();
"f" => $from_user_id, $messagesan = self::sanitize($message);
"m" => $messagesan,
"username" => get_lang('Me') if (!isset($_SESSION['chatHistory'][$to_user_id])) {
); $_SESSION['chatHistory'][$to_user_id] = array();
$_SESSION['chatHistory'][$to_user_id]['items'][] = $item; }
$_SESSION['chatHistory'][$to_user_id]['user_info']['user_name'] = $user_info['complete_name']; $item = array ( "s" => "1",
$_SESSION['chatHistory'][$to_user_id]['user_info']['online'] = $user_info['user_is_online']; "f" => $from_user_id,
"m" => $messagesan,
unset($_SESSION['tsChatBoxes'][$to_user_id]); "username" => get_lang('Me')
);
$params = array(); $_SESSION['chatHistory'][$to_user_id]['items'][] = $item;
$params['from_user'] = intval($from_user_id); $_SESSION['chatHistory'][$to_user_id]['user_info']['user_name'] = $user_info['complete_name'];
$params['to_user'] = intval($to_user_id); $_SESSION['chatHistory'][$to_user_id]['user_info']['online'] = $user_info['user_is_online'];
$params['message'] = $message;
$params['sent'] = api_get_utc_datetime(); unset($_SESSION['tsChatBoxes'][$to_user_id]);
if (!empty($from_user_id) && !empty($to_user_id)) { $params = array();
$this->save($params); $params['from_user'] = intval($from_user_id);
$params['to_user'] = intval($to_user_id);
$params['message'] = $message;
$params['sent'] = api_get_utc_datetime();
if (!empty($from_user_id) && !empty($to_user_id)) {
$this->save($params);
}
//print_r($_SESSION['chatHistory']);
echo "1";
exit;
} else {
echo "0";
exit;
} }
//print_r($_SESSION['chatHistory']);
echo "1";
exit;
} }
/** /**
* Close a specific chat box (user ID taken from $_POST['chatbox']) * Close a specific chat box (user ID taken from $_POST['chatbox'])

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

@ -49,8 +49,8 @@ class SocialManager extends UserManager {
} else { } else {
return $friend_relation_list; return $friend_relation_list;
} }
} }
/** /**
* Get relation type contact by name * Get relation type contact by name
* @param string names of the kind of relation * @param string names of the kind of relation
@ -58,14 +58,14 @@ class SocialManager extends UserManager {
* @author isaac flores paz * @author isaac flores paz
*/ */
public static function get_relation_type_by_name ($relation_type_name) { public static function get_relation_type_by_name ($relation_type_name) {
$list_type_friend=array(); $list_type_friend = self::show_list_type_friends();
$list_type_friend=self::show_list_type_friends();
foreach ($list_type_friend as $value_type_friend) { foreach ($list_type_friend as $value_type_friend) {
if (strtolower($value_type_friend['title'])==$relation_type_name) { if (strtolower($value_type_friend['title'])==$relation_type_name) {
return $value_type_friend['id']; return $value_type_friend['id'];
} }
} }
} }
/** /**
* Get the kind of relation between contacts * Get the kind of relation between contacts
* @param int user id * @param int user id
@ -80,7 +80,7 @@ class SocialManager extends UserManager {
'WHERE rt.id=(SELECT uf.relation_type FROM '.$tbl_my_friend.' uf WHERE user_id='.((int)$user_id).' AND friend_user_id='.((int)$user_friend).' AND uf.relation_type <> '.USER_RELATION_TYPE_RRHH.' )'; 'WHERE rt.id=(SELECT uf.relation_type FROM '.$tbl_my_friend.' uf WHERE user_id='.((int)$user_id).' AND friend_user_id='.((int)$user_friend).' AND uf.relation_type <> '.USER_RELATION_TYPE_RRHH.' )';
$res=Database::query($sql); $res=Database::query($sql);
if (Database::num_rows($res)>0) { if (Database::num_rows($res)>0) {
$row=Database::fetch_array($res,'ASSOC'); $row = Database::fetch_array($res,'ASSOC');
return $row['id']; return $row['id'];
} else { } else {
return USER_UNKNOW; return USER_UNKNOW;
@ -531,6 +531,9 @@ class SocialManager extends UserManager {
} }
$user_info = api_get_user_info($user_id, true); $user_info = api_get_user_info($user_id, true);
$current_user_id = api_get_user_id();
$user_friend_relation = SocialManager::get_relation_between_contacts($current_user_id, $user_id);
$show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list', 'browse_groups'); $show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list', 'browse_groups');
//$show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose'); //$show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose');
@ -560,7 +563,7 @@ class SocialManager extends UserManager {
$html .= '</div>'; $html .= '</div>';
} else { } else {
$img_array = UserManager::get_user_picture_path_by_id($user_id,'web',true,true); $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 = UserManager::get_picture_user($user_id, $img_array['file'],'', USER_IMAGE_SIZE_BIG);
$big_image = $big_image['file'].'?'.uniqid(); $big_image = $big_image['file'].'?'.uniqid();
$normal_image = $img_array['dir'].$img_array['file'].'?'.uniqid(); $normal_image = $img_array['dir'].$img_array['file'].'?'.uniqid();
@ -616,12 +619,12 @@ class SocialManager extends UserManager {
} }
if ($show == 'shared_profile') { if ($show == 'shared_profile') {
//echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>'; //echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
$html .= '<div class="well sidebar-nav"> $html .= '<div class="well sidebar-nav">
<ul class="nav nav-list">'; <ul class="nav nav-list">';
// My own profile // My own profile
if ($show_full_profile && $user_id == intval(api_get_user_id())) { if ($show_full_profile && $user_id == intval(api_get_user_id())) {
$html .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array()).get_lang('Home').'</a></li> $html .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array()).get_lang('Home').'</a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png', get_lang('Messages'),array()).get_lang('Messages').$count_unread_message.'</a></li>'; <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png', get_lang('Messages'),array()).get_lang('Messages').$count_unread_message.'</a></li>';
$active = $show=='invitations' ? 'active' : null; $active = $show=='invitations' ? 'active' : null;
@ -634,28 +637,28 @@ class SocialManager extends UserManager {
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('zoom.png',get_lang('Search'),array()).get_lang('Search').'</a></li>'; $html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('zoom.png',get_lang('Search'),array()).get_lang('Search').'</a></li>';
$active = $show=='myfiles' ? 'active' : null; $active = $show=='myfiles' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array(),16).get_lang('MyFiles').'</a></li>'; $html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array(),16).get_lang('MyFiles').'</a></li>';
} }
// My friend profile // My friend profile
if ($user_id != api_get_user_id()) { if ($user_id != api_get_user_id()) {
$html .= '<li><a href="javascript:void(0);" onclick="javascript:send_message_to_user(\''.$user_id.'\');" title="'.get_lang('SendMessage').'">'; $html .= '<li><a href="javascript:void(0);" onclick="javascript:send_message_to_user(\''.$user_id.'\');" title="'.get_lang('SendMessage').'">';
$html .= Display::return_icon('compose_message.png',get_lang('SendMessage')).'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>'; $html .= Display::return_icon('compose_message.png',get_lang('SendMessage')).'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>';
} }
//check if I already sent an invitation message //check if I already sent an invitation message
$invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id()); $invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id());
if (isset($invitation_sent_list[$user_id]) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) > 0 ) { if (isset($invitation_sent_list[$user_id]) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) > 0 ) {
$html .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>'; $html .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
} else { } else {
if (!$show_full_profile) { if (!$show_full_profile) {
$html .= '<li><a href="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user_id.'\');" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>'; $html .= '<li><a href="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user_id.'\');" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
} }
} }
//@todo check if user is online and if it's a friend to show the chat link //@todo check if user is online and if it's a friend to show the chat link
if (api_get_setting('allow_global_chat') == 'true' && $show_full_profile) { if (api_get_setting('allow_global_chat') == 'true' && $user_friend_relation == USER_RELATION_TYPE_FRIEND) {
if ($user_id != api_get_user_id()) { if ($user_id != api_get_user_id()) {
$user_name = $user_info['complete_name']; $user_name = $user_info['complete_name'];
@ -664,7 +667,7 @@ class SocialManager extends UserManager {
$html .= Display::tag('li', Display::url($chat_icon.'&nbsp;&nbsp;'.get_lang('Chat'), 'javascript:void(0);', $options)); $html .= Display::tag('li', Display::url($chat_icon.'&nbsp;&nbsp;'.get_lang('Chat'), 'javascript:void(0);', $options));
} }
} }
$html .= '</ul></div>'; $html .= '</ul></div>';
if ($show_full_profile && $user_id == intval(api_get_user_id())) { if ($show_full_profile && $user_id == intval(api_get_user_id())) {
$personal_course_list = UserManager::get_personal_session_course_list($user_id); $personal_course_list = UserManager::get_personal_session_course_list($user_id);

Write Preview
Loading…
Cancel
Save