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

Adding label "YouHaveToAddXAsAFriendFirst"

Browse Source
skala
Julio Montoya 13 years ago
parent 4818d4e7ea
commit 8c63404c2f
3 changed files with 119 additions and 98 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. 185
      main/inc/lib/javascript/chat/js/chat.js
  2. 30
      main/inc/lib/social.lib.php
  3. 2
      main/social/profile.php

185
main/inc/lib/javascript/chat/js/chat.js
Unescape View File

@ -3,7 +3,7 @@
Copyright (c) 2009 Anant Garg (anantgarg.com | inscripts.com) Copyright (c) 2009 Anant Garg (anantgarg.com | inscripts.com)
This script may be used for non-commercial purposes only. For any This script may be used for non-commercial purposes only. For any
commercial purposes, please contact the author at commercial purposes, please contact the author at
anant.garg@inscripts.com anant.garg@inscripts.com
Changes and Chamilo Integration: Julio Montoya <gugli100@gmail.com> Changes and Chamilo Integration: Julio Montoya <gugli100@gmail.com>
@ -42,8 +42,8 @@ function set_user_status(status) {
$.ajax({ $.ajax({
url: ajax_url+"?action=set_status", url: ajax_url+"?action=set_status",
data: "status="+status, data: "status="+status,
cache: false, cache: false,
success: function(data) { success: function(data) {
} }
}); });
user_status = status; user_status = status;
@ -51,8 +51,8 @@ function set_user_status(status) {
$(document).ready(function() { $(document).ready(function() {
originalTitle = document.title; originalTitle = document.title;
startChatSession(); startChatSession();
$([window, document]).blur(function() { $([window, document]).blur(function() {
windowFocus = false; windowFocus = false;
@ -60,59 +60,59 @@ $(document).ready(function() {
windowFocus = true; windowFocus = true;
document.title = originalTitle; document.title = originalTitle;
}); });
/* Live conditions */ /* Live conditions */
// User name header toogle // User name header toogle
$('#chatboxtitlemain').live('click', function() { $('#chatboxtitlemain').live('click', function() {
if (user_status == 1) { if (user_status == 1) {
stopChatHeartBeat(); stopChatHeartBeat();
$('.user_status_main').html(offline_button); $('.user_status_main').html(offline_button);
$('#chatboxtitlemain').html(disconnect_lang); $('#chatboxtitlemain').html(disconnect_lang);
set_user_status(0); set_user_status(0);
} else { } else {
startChatHeartBeat(); startChatHeartBeat();
$('.user_status_main').html(online_button); $('.user_status_main').html(online_button);
$('#chatboxtitlemain').html(connect_lang); $('#chatboxtitlemain').html(connect_lang);
set_user_status(1); set_user_status(1);
} }
}); });
// User name header toogle // User name header toogle
$('.chatboxtitle').live('click', function(){ $('.chatboxtitle').live('click', function(){
chatbox = $(this).parents(".chatbox"); chatbox = $(this).parents(".chatbox");
var chat_id = chatbox.attr('id'); var chat_id = chatbox.attr('id');
chat_id = chat_id.split('_')[1]; chat_id = chat_id.split('_')[1];
toggleChatBoxGrowth(chat_id); toggleChatBoxGrowth(chat_id);
}); });
//Minimize button //Minimize button
$('.chatboxhead .togglelink').live('click', function(){ $('.chatboxhead .togglelink').live('click', function(){
var chat_id = $(this).attr('rel'); var chat_id = $(this).attr('rel');
toggleChatBoxGrowth(chat_id); toggleChatBoxGrowth(chat_id);
}); });
//Close button //Close button
$('.chatboxhead .closelink').live('click', function(){ $('.chatboxhead .closelink').live('click', function(){
var chat_id = $(this).attr('rel'); var chat_id = $(this).attr('rel');
closeChatBox(chat_id); closeChatBox(chat_id);
}); });
}); });
function showChatConnect() { function showChatConnect() {
if (user_status == 1) { if (user_status == 1) {
button = online_button; button = online_button;
label = connect_lang; label = connect_lang;
} else { } else {
button = offline_button; button = offline_button;
label = disconnect_lang; label = disconnect_lang;
} }
$("<div />" ).attr("id","chatmain") $("<div />" ).attr("id","chatmain")
.addClass("chatboxmain") .addClass("chatboxmain")
.html('<div class="chatboxheadmain"><div class="user_status_main">'+button+'</div><div id="chatboxtitlemain">'+label+'</div><div class="chatboxoptions"></div><br clear="all"/></div></div>') .html('<div class="chatboxheadmain"><div class="user_status_main">'+button+'</div><div id="chatboxtitlemain">'+label+'</div><div class="chatboxoptions"></div><br clear="all"/></div></div>')
.appendTo($( "body" )); .appendTo($( "body" ));
} }
@ -128,25 +128,25 @@ function startChatSession() {
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
if (data) { if (data) {
username = data.me; username = data.me;
user_status = data.user_status; user_status = data.user_status;
showChatConnect(); showChatConnect();
if (user_status == 1) { if (user_status == 1) {
startChatHeartBeat(); startChatHeartBeat();
} else { } else {
stopChatHeartBeat(); stopChatHeartBeat();
} }
$.each(data.items, function(my_user_id, user_items) { $.each(data.items, function(my_user_id, user_items) {
my_items = user_items['items']; my_items = user_items['items'];
$.each(my_items, function(i, item) { $.each(my_items, function(i, item) {
if (item) { // fix strange ie bug if (item) { // fix strange ie bug
//my_user_id = item.f; //my_user_id = item.f;
if ($("#chatbox_"+my_user_id).length <= 0) { if ($("#chatbox_"+my_user_id).length <= 0) {
createChatBox(my_user_id, user_items.user_info.user_name, 1, user_items.user_info.online); createChatBox(my_user_id, user_items.user_info.user_name, 1, user_items.user_info.online);
} }
if (item.s == 1) { if (item.s == 1) {
//item.f = username; //item.f = username;
} }
@ -159,31 +159,31 @@ function startChatSession() {
} }
} }
}); });
}); });
for (i=0;i<chatBoxes.length;i++) { for (i=0;i<chatBoxes.length;i++) {
my_user_id = chatBoxes[i]; my_user_id = chatBoxes[i];
$("#chatbox_"+my_user_id+" .chatboxcontent").scrollTop($("#chatbox_"+my_user_id+" .chatboxcontent")[0].scrollHeight); $("#chatbox_"+my_user_id+" .chatboxcontent").scrollTop($("#chatbox_"+my_user_id+" .chatboxcontent")[0].scrollHeight);
} }
} }
}}); }});
} }
} }
function stopChatHeartBeat() { function stopChatHeartBeat() {
clearInterval(timer); clearInterval(timer);
timer = null; timer = null;
} }
function startChatHeartBeat() { function startChatHeartBeat() {
timer = setInterval('chatHeartbeat();', chatHeartbeatTime); timer = setInterval('chatHeartbeat();', chatHeartbeatTime);
} }
/* /*
* Shows the user messages in all windows * Shows the user messages in all windows
* *
* Item array structure : * Item array structure :
* *
* item.s = type of message: 1 = message, 2 = "sent at" string * item.s = type of message: 1 = message, 2 = "sent at" string
* item.m = message * item.m = message
* item.f = from_user * item.f = from_user
@ -191,23 +191,23 @@ function startChatHeartBeat() {
**/ **/
function chatHeartbeat() { function chatHeartbeat() {
var itemsfound = 0; var itemsfound = 0;
if (windowFocus == false) { if (windowFocus == false) {
var blinkNumber = 0; var blinkNumber = 0;
var titleChanged = 0; var titleChanged = 0;
for (x in newMessagesWin) { for (x in newMessagesWin) {
if (newMessagesWin[x].status == true) { if (newMessagesWin[x].status == true) {
++blinkNumber; ++blinkNumber;
if (blinkNumber >= blinkOrder) { if (blinkNumber >= blinkOrder) {
document.title = newMessagesWin[x].username+' says...'; document.title = newMessagesWin[x].username+' says...';
titleChanged = 1; titleChanged = 1;
break; break;
} }
} }
} }
if (titleChanged == 0) { if (titleChanged == 0) {
document.title = originalTitle; document.title = originalTitle;
blinkOrder = 0; blinkOrder = 0;
@ -229,16 +229,16 @@ function chatHeartbeat() {
} }
} }
} }
$.ajax({ $.ajax({
url: ajax_url+"?action=chatheartbeat", url: ajax_url+"?action=chatheartbeat",
cache: false, cache: false,
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
$.each(data.items, function(my_user_id, user_items) { $.each(data.items, function(my_user_id, user_items) {
my_items = user_items['items']; my_items = user_items['items'];
$.each(my_items, function(i, item) { $.each(my_items, function(i, item) {
if (item) { // fix strange ie bug if (item) { // fix strange ie bug
@ -260,17 +260,17 @@ function chatHeartbeat() {
$("#chatbox_"+my_user_id+" .chatboxcontent").append('<div class="chatboxmessage"><span class="chatboxinfo">'+item.m+'</span></div>'); $("#chatbox_"+my_user_id+" .chatboxcontent").append('<div class="chatboxmessage"><span class="chatboxinfo">'+item.m+'</span></div>');
} else { } else {
newMessages[my_user_id] = {'status':true, 'username':item.username}; newMessages[my_user_id] = {'status':true, 'username':item.username};
newMessagesWin[my_user_id] = {'status':true, 'username':item.username}; newMessagesWin[my_user_id] = {'status':true, 'username':item.username};
$("#chatbox_"+my_user_id+" .chatboxcontent").append('<div class="chatboxmessage">\n\ $("#chatbox_"+my_user_id+" .chatboxcontent").append('<div class="chatboxmessage">\n\
<span class="chatboxmessagefrom">'+item.username+':&nbsp;&nbsp;</span>\n\ <span class="chatboxmessagefrom">'+item.username+':&nbsp;&nbsp;</span>\n\
<span class="chatboxmessagecontent">'+item.m+'</span></div>'); <span class="chatboxmessagecontent">'+item.m+'</span></div>');
} }
$("#chatbox_"+my_user_id+" .chatboxcontent").scrollTop($("#chatbox_"+my_user_id+" .chatboxcontent")[0].scrollHeight); $("#chatbox_"+my_user_id+" .chatboxcontent").scrollTop($("#chatbox_"+my_user_id+" .chatboxcontent")[0].scrollHeight);
if ($('#chatbox_'+my_user_id+' .chatboxcontent').css('display') == 'none') { if ($('#chatbox_'+my_user_id+' .chatboxcontent').css('display') == 'none') {
$('#chatbox_'+my_user_id+' .chatboxhead').toggleClass('chatboxblink'); $('#chatbox_'+my_user_id+' .chatboxhead').toggleClass('chatboxblink');
} }
itemsfound += 1; itemsfound += 1;
} }
@ -292,13 +292,13 @@ function chatHeartbeat() {
//timer = setTimeout('chatHeartbeat();',chatHeartbeatTime); //timer = setTimeout('chatHeartbeat();',chatHeartbeatTime);
} }
}); //ajax }); //ajax
} }
function closeChatBox(user_id) { function closeChatBox(user_id) {
$('#chatbox_'+user_id).css('display','none'); $('#chatbox_'+user_id).css('display','none');
restructureChatBoxes(); restructureChatBoxes();
$.post(ajax_url+"?action=closechat", {chatbox: user_id} , function(data){ $.post(ajax_url+"?action=closechat", {chatbox: user_id} , function(data){
}); });
} }
@ -321,18 +321,25 @@ function restructureChatBoxes() {
/** /**
* Function that fires the chat with an user (creates a chat bloclk) * Function that fires the chat with an user (creates a chat bloclk)
* @param int user id * @param int user id
* @param string user's firstname + lastname * @param string user's firstname + lastname
* @param status * @param status
* *
**/ **/
function chatWith(user_id, user_name, status) { function chatWith(user_id, user_name, status) {
createChatBox(user_id, user_name, 0, status); createChatBox(user_id, user_name, 0, 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
*/ */
function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) { function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) {
if ($("#chatbox_"+user_id).length > 0) { if ($("#chatbox_"+user_id).length > 0) {
@ -342,7 +349,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) {
} }
$("#chatbox_"+user_id+" .chatboxtextarea").focus(); $("#chatbox_"+user_id+" .chatboxtextarea").focus();
return; return;
} }
user_is_online = return_online_user(user_id, online); user_is_online = return_online_user(user_id, online);
@ -358,9 +365,9 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) {
<div class="chatboxcontent"></div>\n\ <div class="chatboxcontent"></div>\n\
<div class="chatboxinput"><textarea class="chatboxtextarea" onkeydown="javascript:return checkChatBoxInputKey(event,this,\''+user_id+'\');"></textarea></div>') <div class="chatboxinput"><textarea class="chatboxtextarea" onkeydown="javascript:return checkChatBoxInputKey(event,this,\''+user_id+'\');"></textarea></div>')
.appendTo($( "body" )); .appendTo($( "body" ));
$("#chatbox_"+user_id).css('bottom', '0px'); $("#chatbox_"+user_id).css('bottom', '0px');
chatBoxeslength = 0; chatBoxeslength = 0;
for (x in chatBoxes) { for (x in chatBoxes) {
@ -375,7 +382,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) {
width = (chatBoxeslength)*(225+7)+20 +225; width = (chatBoxeslength)*(225+7)+20 +225;
$("#chatbox_"+user_id).css('right', width+'px'); $("#chatbox_"+user_id).css('right', width+'px');
} }
chatBoxes.push(user_id); chatBoxes.push(user_id);
if (minimizeChatBox == 1) { if (minimizeChatBox == 1) {
@ -418,28 +425,28 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) {
} }
/** /**
* Creates the div user status (green/gray button next to the user name) * Creates the div user status (green/gray button next to the user name)
* @param int user id * @param int user id
* @param int status 1 or 0 * @param int status 1 or 0
*/ */
function return_online_user(user_id, status) { function return_online_user(user_id, status) {
var div_wrapper = $("<div />" ); var div_wrapper = $("<div />" );
var new_div = $("<div />" ); var new_div = $("<div />" );
new_div.attr("id","online_"+user_id); new_div.attr("id","online_"+user_id);
new_div.attr("class","user_status"); new_div.attr("class","user_status");
if (status == '1' || status == 1) { if (status == '1' || status == 1) {
new_div.html(online_button); new_div.html(online_button);
} else { } else {
new_div.html(offline_button); new_div.html(offline_button);
} }
div_wrapper.append(new_div); div_wrapper.append(new_div);
return div_wrapper.html(); return div_wrapper.html();
} }
/** /**
* Updates the user status (green/gray button next to the user name) * Updates the user status (green/gray button next to the user name)
*/ */
function update_online_user(user_id, status) { function update_online_user(user_id, status) {
if ($("#online_" +user_id).length > 0) { if ($("#online_" +user_id).length > 0) {
@ -452,13 +459,13 @@ function update_online_user(user_id, status) {
} }
function toggleChatBoxGrowth(user_id) { function toggleChatBoxGrowth(user_id) {
if ($('#chatbox_'+user_id+' .chatboxcontent').css('display') == 'none') { if ($('#chatbox_'+user_id+' .chatboxcontent').css('display') == 'none') {
var minimizedChatBoxes = new Array(); var minimizedChatBoxes = new Array();
if ($.cookie('chatbox_minimized')) { if ($.cookie('chatbox_minimized')) {
minimizedChatBoxes = $.cookie('chatbox_minimized').split(/\|/); minimizedChatBoxes = $.cookie('chatbox_minimized').split(/\|/);
} }
var newCookie = ''; var newCookie = '';
@ -475,7 +482,7 @@ function toggleChatBoxGrowth(user_id) {
$('#chatbox_'+user_id+' .chatboxcontent').css('display','block'); $('#chatbox_'+user_id+' .chatboxcontent').css('display','block');
$('#chatbox_'+user_id+' .chatboxinput').css('display','block'); $('#chatbox_'+user_id+' .chatboxinput').css('display','block');
$("#chatbox_"+user_id+" .chatboxcontent").scrollTop($("#chatbox_"+user_id+" .chatboxcontent")[0].scrollHeight); $("#chatbox_"+user_id+" .chatboxcontent").scrollTop($("#chatbox_"+user_id+" .chatboxcontent")[0].scrollHeight);
} else { } else {
var newCookie = user_id; var newCookie = user_id;
if ($.cookie('chatbox_minimized')) { if ($.cookie('chatbox_minimized')) {
newCookie += '|'+$.cookie('chatbox_minimized'); newCookie += '|'+$.cookie('chatbox_minimized');
@ -483,7 +490,7 @@ function toggleChatBoxGrowth(user_id) {
$.cookie('chatbox_minimized',newCookie); $.cookie('chatbox_minimized',newCookie);
$('#chatbox_'+user_id+' .chatboxcontent').css('display','none'); $('#chatbox_'+user_id+' .chatboxcontent').css('display','none');
$('#chatbox_'+user_id+' .chatboxinput').css('display','none'); $('#chatbox_'+user_id+' .chatboxinput').css('display','none');
} }
} }
function checkChatBoxInputKey(event, chatboxtextarea, user_id) { function checkChatBoxInputKey(event, chatboxtextarea, user_id) {
@ -494,15 +501,15 @@ function checkChatBoxInputKey(event, chatboxtextarea, user_id) {
$(chatboxtextarea).val(''); $(chatboxtextarea).val('');
$(chatboxtextarea).focus(); $(chatboxtextarea).focus();
$(chatboxtextarea).css('height','44px'); $(chatboxtextarea).css('height','44px');
if (message != '') { if (message != '') {
$.post(ajax_url + "?action=sendchat", {to: user_id, message: message} , function(data) { $.post(ajax_url + "?action=sendchat", {to: user_id, message: message} , function(data) {
message = message.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/\"/g,"&quot;"); message = message.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/\"/g,"&quot;");
$("#chatbox_"+user_id+" .chatboxcontent").append('<div class="chatboxmessage">\n\ $("#chatbox_"+user_id+" .chatboxcontent").append('<div class="chatboxmessage">\n\
<span class="chatboxmessagefrom">'+username+':&nbsp;&nbsp;</span>\n\ <span class="chatboxmessagefrom">'+username+':&nbsp;&nbsp;</span>\n\
<span class="chatboxmessagecontent">'+message+'</span></div>'); <span class="chatboxmessagecontent">'+message+'</span></div>');
$("#chatbox_"+user_id+" .chatboxcontent").scrollTop($("#chatbox_"+user_id+" .chatboxcontent")[0].scrollHeight); $("#chatbox_"+user_id+" .chatboxcontent").scrollTop($("#chatbox_"+user_id+" .chatboxcontent")[0].scrollHeight);
}); });
@ -524,7 +531,7 @@ function checkChatBoxInputKey(event, chatboxtextarea, user_id) {
$(chatboxtextarea).css('height',adjustedHeight+8 +'px'); $(chatboxtextarea).css('height',adjustedHeight+8 +'px');
} else { } else {
$(chatboxtextarea).css('overflow','auto'); $(chatboxtextarea).css('overflow','auto');
} }
} }

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

@ -692,16 +692,28 @@ 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()) {
if ($user_id != api_get_user_id()) { $user_name = $user_info['complete_name'];
//Only show chat if I'm available to talk
if ($current_user_info['user_is_online_in_chat'] == 1) { if ($user_friend_relation == USER_RELATION_TYPE_FRIEND) {
$user_name = $user_info['complete_name']; if ($user_id != api_get_user_id()) {
//Only show chat if I'm available to talk
$options = array('onclick' => "javascript:chatWith('".$user_id."', '".Security::remove_XSS($user_name)."', '".$user_info['user_is_online_in_chat']."')"); if ($current_user_info['user_is_online_in_chat'] == 1) {
$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')); $options = array('onclick' => "javascript:chatWith('".$user_id."', '".Security::remove_XSS($user_name)."', '".$user_info['user_is_online_in_chat']."')");
$html .= Display::tag('li', Display::url($chat_icon.'&nbsp;&nbsp;'.get_lang('Chat'), 'javascript:void(0);', $options)); $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.'&nbsp;&nbsp;'.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.'&nbsp;&nbsp;'.get_lang('Chat'), 'javascript:void(0);', $options));
}
} }
} }
} }

2
main/social/profile.php
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save