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

[svn r20707] logic changes - improvements in social network - (partial FS#3909)

Browse Source
skala
Isaac Flores 16 years ago
parent 5c10616442
commit 93ca12ae3a
4 changed files with 76 additions and 30 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/messages/inbox.php
  2. 9
      main/messages/new_message.php
  3. 37
      main/social/data_personal.inc.php
  4. 53
      main/social/index.php

7
main/messages/inbox.php
Unescape View File

@ -82,7 +82,7 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
$info_delete=array();
/***********************************************/
if ( isset($_GET['form_reply']) ) {
$info_reply=explode(',',$_GET['form_reply']);
$info_reply=explode(base64_encode('&%ff..x'),$_GET['form_reply']);
$count_reply=count($info_reply);
$button_sent=urldecode($info_reply[4]);
}
@ -96,10 +96,11 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
if ( isset($button_sent) ) {
$title = api_convert_encoding(urldecode($info_reply[0]),'UTF-8',$charset);
$content = api_convert_encoding(urldecode($info_reply[1]),'UTF-8',$charset);
$content = api_convert_encoding(str_replace("\\","",urldecode($info_reply[1])),'UTF-8',$charset);
$title = Security::remove_XSS($title);
$content = Security::remove_XSS($content,COURSEMANAGER);
//$title = urldecode($info_reply[0]);
//$content = urldecode($info_reply[1]);
$user_reply= $info_reply[2];
$user_email_base=str_replace(')','(',$info_reply[5]);
$user_email_prepare=explode('(',$user_email_base);

9
main/messages/new_message.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: new_message.php 20660 2009-05-14 20:47:57Z aportugal $
<?php // $Id: new_message.php 20707 2009-05-15 17:58:05Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -74,7 +74,7 @@ function validate(form,list)
$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready(function (){
cont=0;
cont=0;
$("#id_text_name").bind("keyup", function(){
name=$("#id_text_name").get(0).value;
$.ajax({
@ -104,6 +104,7 @@ $nameTools = api_xml_http_response_encode(get_lang('ComposeMessage'));
$fck_attribute['Height'] = "150";
$fck_attribute['Width'] = "95%";
$fck_attribute['ToolbarSet'] = "Profil";
$fck_attribute['Config']['ToolbarStartExpanded']='false';
/*
==============================================================================
FUNCTIONS
@ -155,13 +156,13 @@ function manage_form ($default, $select_from_user_list = null) {
$form = new FormValidator('compose_message');
}
if (isset($select_from_user_list)) {
$form->add_textfield('id_text_name', api_xml_http_response_encode(get_lang('SendMessageTo')),true,array('size' => 40,'id'=>'id_text_name','onclick'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()'));
$form->add_textfield('id_text_name', api_xml_http_response_encode(get_lang('SendMessageTo')),true,array('size' => 40,'id'=>'id_text_name','onkeyup'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()','autocomplete'=>'off'));
$form->addRule('id_text_name', api_xml_http_response_encode(get_lang('ThisFieldIsRequired')), 'required');
$form->addElement('html','<div id="id_div_search" class="message-search">&nbsp;</div>');
$form->addElement('hidden','user_list',0,array('id'=>'user_list'));
} else {
if ($default['user_list']==0) {
$form->add_textfield('id_text_name', api_xml_http_response_encode(get_lang('SendMessageTo')),true,array('size' => 40,'id'=>'id_text_name','onclick'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()'));
$form->add_textfield('id_text_name', api_xml_http_response_encode(get_lang('SendMessageTo')),true,array('size' => 40,'id'=>'id_text_name','onkeyup'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()','autocomplete'=>'off'));
$form->addRule('id_text_name', api_xml_http_response_encode(get_lang('ThisFieldIsRequired')), 'required');
$form->addElement('html','<div id="id_div_search" class="message-search">&nbsp;</div>');
}

37
main/social/data_personal.inc.php
Unescape View File

@ -24,6 +24,7 @@
$language_file = array('registration','messages','userInfo','admin','forum','blog');
require_once ('../inc/global.inc.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once (api_get_path(LIBRARY_PATH).'social.lib.php');
// @todo here we must show the user information as read only
//User picture size is calculated from SYSTEM path
@ -117,11 +118,8 @@ $language_variable=api_xml_http_response_encode(get_lang('PersonalData'));
echo '<a href="../social/profile.php?shared=true">'.Display::return_icon('shared_profile.png',api_xml_http_response_encode(get_lang('ViewSharedProfile'))).'&nbsp;'.api_xml_http_response_encode(get_lang('ViewSharedProfile')).'</a>';
}
echo '</div>';
echo '<div id="profile_container" style="width:550px;display:block;">';
echo '<div id="picture" style="width:200px;float:right;position:relative;">';
echo '<img src='.$img_array['dir'].$img_array['file'].' />';
echo '</div>';
echo '<div class="social-profile-info">';
echo '<div id="profile_container">';
echo '<div class="social-profile-info" style="float:left;position:relative">';
echo '<dt>'.api_xml_http_response_encode(get_lang('UserName')).'</dt>
<dd>'. api_xml_http_response_encode($user_info['username']).' </dd>';
echo '<dt>'.api_xml_http_response_encode(get_lang('FirstName')).'</dt>
@ -135,6 +133,33 @@ $language_variable=api_xml_http_response_encode(get_lang('PersonalData'));
echo '<dt>'.api_xml_http_response_encode(get_lang('Phone')).'</dt>
<dd>'. api_xml_http_response_encode($user_info['phone']).'</dd>';
echo '</div>';
echo '</div>';
echo '<div style="float:left;position:relative">';
echo '<div id="picture" style="width:200px;float:left;position:relative;margin-top:10px;">';
echo '<img src='.$img_array['dir'].$img_array['file'].' />';
echo '</div>';
/*if (api_get_setting('allow_message_tool')=='true') {
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
$number_of_new_messages = MessageManager::get_new_messages();
$number_of_outbox_message=MessageManager::get_number_of_messages_sent();
$cant_out_box=' ('.$number_of_outbox_message.')';
$cant_msg = ' ('.$number_of_new_messages.')';
$number_of_new_messages_of_friend=UserFriend::get_message_number_invitation_by_user_id(api_get_user_id());
//echo '<div class="message-view" style="display:none;">'.get_lang('ViewMessages').'</div>';
echo '<div class="message-content" style="float:right" >
<h2 class="message-title" style="margin-top:0">'.get_lang('Messages').'</h2>
<p>
<a href="../social/index.php#remote-tab-2" class="message-body">'.get_lang('Inbox').$cant_msg.' </a><br />
<a href="../social/index.php#remote-tab-3" class="message-body">'.get_lang('Outbox').$cant_out_box.'</a><br />
</p>';
echo '<img src="../img/delete.gif" alt="'.get_lang('Close').'" title="'.get_lang('Close').'" class="message-delete" onclick="delete_message_js()" />';
if ($number_of_new_messages_of_friend>0) {
echo '<br/>';
}
echo '</div>';
}*/
echo '</div>';
}
?>

53
main/social/index.php
Unescape View File

@ -300,29 +300,40 @@ function compose_and_show_message (my_action,name_rs) {
}
function send_request_and_search() {
cont=0;
$("#id_text_name").bind("keyup", function(){
//$("#id_text_name").bind("keyup", function(){
name=$("#id_text_name").get(0).value;
if (name.length==0) {
return false;
}
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {
/*$("#id_div_search").html("Searching...");*/ },
//$("#id_div_search").html("Searching...");
},
type: "POST",
url: "../social/select_options.php",
data: "search="+name,
success: function(datos){
$("#id_div_search").html(datos)
$("#id_search_name").bind("click", function() {
name_option=$("select#id_search_name option:selected").text();
code_option=$("select#id_search_name option:selected").val();
$("#user_list").attr("value", code_option);
$("#id_text_name").attr("value", name_option);
$("#id_div_search").html("");
cont++;
});
num_records=datos.split(\'</option>\');
if (num_records.length==1) {
$("#id_div_search").html("");
return false;
}
$("#id_div_search").html(datos)
$("#id_search_name").bind("click", function() {
name_option=$("select#id_search_name option:selected").text();
code_option=$("select#id_search_name option:selected").val();
$("#user_list").attr("value", code_option);
$("#id_text_name").attr("value", name_option);
$("#id_div_search").html("");
cont++;
});
}
});
});
//});
}
function delete_one_message (num_id) {
$("div#div_content_messages").html("");
@ -391,6 +402,14 @@ function hide_search_list () {
$("div#id_div_search").html("");
}
</script>';
if (api_get_setting('allow_message_tool')=='true') {
$htmlHeadXtra[] ='<script type="text/javascript">
function delete_message_js() {
$(".message-content").animate({ opacity: "hide" }, "slow");
$(".message-view").animate({ opacity: "show" }, "slow");
}
</script>';
}
$htmlHeadXtra[] = '<link rel="stylesheet" href="../inc/lib/javascript/jquery.tabs.css" type="text/css" media="print, projection, screen">';
$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_CODE_PATH).'css/'.api_get_setting('stylesheets').'/jquery.tabs.css" type="text/css" media="print, projection, screen">';
$htmlHeadXtra[] = '
@ -444,14 +463,14 @@ if ((api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_mess
Display :: display_header('');
if (isset($_GET['sendform'])) {
$form_reply=array();
$form_reply[]=urlencode(Security::remove_XSS($_POST['title']));
$form_reply[]=urlencode(Security::remove_XSS($_POST['content'],COURSEMANAGER));
$form_reply[]=urlencode($_POST['title']);
$form_reply[]=urlencode($_POST['content']);
$form_reply[]=$_POST['user_list'];
$form_reply[]=$_POST['re_id'];
$form_reply[]=urlencode($_POST['compose']);
$form_reply[]=urlencode(Security::remove_XSS($_POST['id_text_name']));
$form_reply[]=urlencode($_POST['id_text_name']);
$form_reply[]=urlencode($_POST['save_form']);
$form_info=implode(',',$form_reply);
$form_info=implode(base64_encode('&%ff..x'),$form_reply);
$form_send_data_message='?form_reply='.$form_info;
} elseif (isset($_GET['inbox'])) {
$form_delete=array();

Write Preview
Loading…
Cancel
Save