Adding label "YouHaveToAddXAsAFriendFirst"

skala
Julio Montoya 13 years ago
parent 4818d4e7ea
commit 8c63404c2f
  1. 7
      main/inc/lib/javascript/chat/js/chat.js
  2. 18
      main/inc/lib/social.lib.php
  3. 2
      main/social/profile.php

@ -331,6 +331,13 @@ function chatWith(user_id, user_name, status) {
$("#chatbox_"+user_id+" .chatboxtextarea").focus(); $("#chatbox_"+user_id+" .chatboxtextarea").focus();
} }
function chatNotYetWith(message) {
$("#message_ajax_reponse").html(message);
$("#message_ajax_reponse").css('display', 'block');
$("#message_ajax_reponse").attr('class', 'alert');
$('#message_ajax_reponse').alert()
}
/** /**
* Creates a div * Creates a div
*/ */

@ -692,18 +692,30 @@ class SocialManager extends UserManager
} }
} }
//Chat
//@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_is_global_chat_enabled() && $user_friend_relation == USER_RELATION_TYPE_FRIEND) { if (api_is_global_chat_enabled()) {
$user_name = $user_info['complete_name'];
if ($user_friend_relation == USER_RELATION_TYPE_FRIEND) {
if ($user_id != api_get_user_id()) { if ($user_id != api_get_user_id()) {
//Only show chat if I'm available to talk //Only show chat if I'm available to talk
if ($current_user_info['user_is_online_in_chat'] == 1) { if ($current_user_info['user_is_online_in_chat'] == 1) {
$user_name = $user_info['complete_name'];
$options = array('onclick' => "javascript:chatWith('".$user_id."', '".Security::remove_XSS($user_name)."', '".$user_info['user_is_online_in_chat']."')"); $options = array('onclick' => "javascript:chatWith('".$user_id."', '".Security::remove_XSS($user_name)."', '".$user_info['user_is_online_in_chat']."')");
$chat_icon = $user_info['user_is_online_in_chat'] ? Display::return_icon('online.png', get_lang('Online')) : Display::return_icon('offline.png', get_lang('Offline')); $chat_icon = $user_info['user_is_online_in_chat'] ? Display::return_icon('online.png', get_lang('Online')) : Display::return_icon('offline.png', get_lang('Offline'));
$html .= Display::tag('li', Display::url($chat_icon.'  '.get_lang('Chat'), 'javascript:void(0);', $options)); $html .= Display::tag('li', Display::url($chat_icon.'  '.get_lang('Chat'), 'javascript:void(0);', $options));
} }
} }
} else {
if ($user_id != api_get_user_id()) {
if ($current_user_info['user_is_online_in_chat'] == 1) {
$message = Security::remove_XSS(sprintf(get_lang("YouHaveToAddXAsAFriendFirst", $user_name)));
$options = array('onclick' => "javascript:chatNotYetWith('".$message."')");
$chat_icon = $user_info['user_is_online_in_chat'] ? Display::return_icon('online.png', get_lang('Online')) : Display::return_icon('offline.png', get_lang('Offline'));
$html .= Display::tag('li', Display::url($chat_icon.'  '.get_lang('Chat'), 'javascript:void(0);', $options));
}
}
}
} }
$html .= '</ul></div>'; $html .= '</ul></div>';

@ -97,6 +97,7 @@ function send_message_to_user(user_id) {
$.ajax({ $.ajax({
url: url+"&"+params, url: url+"&"+params,
success:function(data) { success:function(data) {
$("#message_ajax_reponse").attr("class", "");
$("#message_ajax_reponse").html(data); $("#message_ajax_reponse").html(data);
$("#message_ajax_reponse").show(); $("#message_ajax_reponse").show();
$("#send_message_div").dialog({ buttons:{}}); $("#send_message_div").dialog({ buttons:{}});
@ -132,6 +133,7 @@ function send_invitation_to_user(user_id) {
$.ajax({ $.ajax({
url: url+"&"+params, url: url+"&"+params,
success:function(data) { success:function(data) {
$("#message_ajax_reponse").attr("class", "");
$("#message_ajax_reponse").html(data); $("#message_ajax_reponse").html(data);
$("#message_ajax_reponse").show(); $("#message_ajax_reponse").show();

Loading…
Cancel
Save