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 r20722] logic changes - improvements in social network - (partial FS#3909)

Browse Source
skala
Isaac Flores 16 years ago
parent a075fe96cb
commit 7b6b0c7f4c
6 changed files with 36 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. 51
      main/inc/lib/message.lib.php
  2. 28
      main/inc/lib/social.lib.php
  3. 2
      main/inc/lib/sortabletable.class.php
  4. 5
      main/messages/inbox.php
  5. 10
      main/messages/new_message.php
  6. 2
      main/social/select_options.php

51
main/inc/lib/message.lib.php
Unescape View File

@ -31,29 +31,13 @@ function inbox_display() {
if ($_SESSION['social_exist']===true) {
$redirect="#remote-tab-2";
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
$success= get_lang('SelectedMessagesDeleted').
" 
<br /><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToInbox').
"</a>";
$success= get_lang('SelectedMessagesDeleted')."&nbsp;<br /><a href=\""."../social/index.php?$redirect\">".get_lang('BackToInbox')."</a>";
} else {
$success= get_lang('SelectedMessagesDeleted').
"&nbsp;
<br /><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToInbox').
"</a>";
$success= get_lang('SelectedMessagesDeleted')."&nbsp;<br /><a href=\""."../social/index.php?$redirect\">".get_lang('BackToInbox')."</a>";
}
} else {
$success= get_lang('SelectedMessagesDeleted').
"&nbsp;
<br /><a href=\"".
"inbox.php\">".
get_lang('BackToOutbox').
"</a>";
$success= get_lang('SelectedMessagesDeleted')."&nbsp;<br /><a href=\""."inbox.php\">".get_lang('BackToOutbox')."</a>";
}
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
@ -70,7 +54,6 @@ function inbox_display() {
break;
}
}
// display sortable table with messages of the current user
$table = new SortableTable('messages', 'get_number_of_messages_mask', 'get_message_data_mask', 3, get_number_of_messages_mask(),'DESC');
$table->set_header(0, '', false,array ('style' => 'width:20px;'));
@ -105,6 +88,8 @@ function get_number_of_messages_mask() {
function get_message_data_mask($from, $number_of_items, $column, $direction) {
$column='3';
$direction='desc';
//non set by SortableTable ?
$number_of_items=get_number_of_messages_mask();
return MessageManager::get_message_data($from, $number_of_items, $column, $direction);
}
function outbox_display() {
@ -114,29 +99,13 @@ function outbox_display() {
if ($_SESSION['social_exist']===true) {
$redirect="#remote-tab-3";
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
$success= get_lang('SelectedMessagesDeleted').
"&nbsp
<br><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToOutbox').
"</a>";
$success= get_lang('SelectedMessagesDeleted')."&nbsp<br><a href=\""."../social/index.php?$redirect\">".get_lang('BackToOutbox')."</a>";
}else {
$success=get_lang('SelectedMessagesDeleted').
"&nbsp
<br><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToOutbox').
"</a>";
$success=get_lang('SelectedMessagesDeleted')."&nbsp<br><a href=\""."../social/index.php?$redirect\">".get_lang('BackToOutbox')."</a>";
}
} else {
$success= get_lang('SelectedMessagesDeleted').
"&nbsp
</b>".
"<br><a href=\"".
"outbox.php\">".
get_lang('BackToOutbox').
"</a>";
$success= get_lang('SelectedMessagesDeleted')."&nbsp</b>"."<br><a href=\""."outbox.php\">".get_lang('BackToOutbox')."</a>";
}
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
@ -190,6 +159,8 @@ function get_number_of_messages_send_mask() {
function get_message_data_send_mask($from, $number_of_items, $column, $direction) {
$column='3';
$direction='desc';
//non set by SortableTable ?
$number_of_items=get_number_of_messages_send_mask();
return MessageManager::get_message_data_sent($from, $number_of_items, $column, $direction);
}
?>
?>

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

@ -28,7 +28,7 @@ class UserFriend extends UserManager {
$row = Database :: fetch_array($result, 'ASSOC');
if ($row['count'] == 0) {
$sql_i = 'INSERT INTO ' . $tbl_my_friend . '(friend_user_id,user_id,relation_type)values(' . Database::escape_string($friend_id) . ','.Database::escape_string($my_user_id).','.Database::escape_string($relation_type).');';
api_sql_query($sql_i, __FILE__, __LINE__);
Database::query($sql_i, __FILE__, __LINE__);
} else {
$sql = 'SELECT COUNT(*) as count FROM ' . $tbl_my_friend . ' WHERE friend_user_id=' . Database::escape_string($friend_id) . ' AND user_id='.Database::escape_string($my_user_id);
$result = Database::query($sql, __FILE__, __LINE__);
@ -54,7 +54,7 @@ class UserFriend extends UserManager {
$result = Database::query($sql, __FILE__, __LINE__);
$row = Database :: fetch_array($result, 'ASSOC');
if ($row['count'] == 1) {
//Delete friend user
//Delete user friend
$sql_i = 'UPDATE ' . $tbl_my_friend . ' SET relation_type=6 WHERE user_id=' . Database::escape_string($user_id).' AND friend_user_id='.Database::escape_string($friend_id);
$sql_j = 'UPDATE ' . $tbl_my_message . ' SET msg_status=7 WHERE user_receiver_id=' . Database::escape_string($user_id).' AND user_sender_id='.Database::escape_string($friend_id);
//Delete user
@ -76,7 +76,7 @@ class UserFriend extends UserManager {
$count_list=0;
$tbl_my_friend_relation_type = Database :: get_main_table(TABLE_MAIN_USER_FRIEND_RELATION_TYPE);
$sql='SELECT id,title FROM '.$tbl_my_friend_relation_type.' WHERE id<>6 ORDER BY id ASC';
$result=api_sql_query($sql,__FILE__,__LINE__);
$result=Database::query($sql,__FILE__,__LINE__);
while ($row=Database::fetch_array($result,'ASSOC')) {
$friend_relation_list[]=$row;
}
@ -115,7 +115,7 @@ class UserFriend extends UserManager {
$tbl_my_friend = Database :: get_main_table(TABLE_MAIN_USER_FRIEND);
$sql= 'SELECT rt.id as id FROM '.$tbl_my_friend_relation_type.' rt ' .
'WHERE rt.id=(SELECT uf.relation_type FROM '.$tbl_my_friend.' uf WHERE user_id='.Database::escape_string($user_id).' AND friend_user_id='.Database::escape_string($user_friend).')';
$res=api_sql_query($sql,__FILE__,__LINE__);
$res=Database::query($sql,__FILE__,__LINE__);
$row=Database::fetch_array($res,'ASSOC');
if (Database::num_rows($res)>0) {
return $row['id'];
@ -142,7 +142,7 @@ class UserFriend extends UserManager {
if (isset($search_name) && is_string($search_name)===true) {
$sql.=' AND friend_user_id IN (SELECT user_id FROM '.$tbl_my_user.' WHERE concat(firstName,lastName) like concat("%","'.Database::escape_string($search_name).'","%"));';
}
$res=api_sql_query($sql,__FILE__,__LINE__);
$res=Database::query($sql,__FILE__,__LINE__);
while ($row=Database::fetch_array($res,'ASSOC')) {
$list_ids_friends[]=$row;
}
@ -199,19 +199,19 @@ class UserFriend extends UserManager {
$current_date=date('Y-m-d H:i:s',time());
$status_invitation=5;//status of pending invitation
$sql_exist='SELECT COUNT(*) AS count FROM '.$tbl_message.' WHERE user_sender_id='.Database::escape_string($user_id).' AND user_receiver_id='.Database::escape_string($friend_id).' AND msg_status IN(5,6,7);';
$res_exist=api_sql_query($sql_exist,__FILE__,__LINE__);
$res_exist=Database::query($sql_exist,__FILE__,__LINE__);
$row_exist=Database::fetch_array($res_exist,'ASSOC');
if ($row_exist['count']==0) {
$sql='INSERT INTO '.$tbl_message.'(user_sender_id,user_receiver_id,msg_status,send_date,title,content) VALUES('.Database::escape_string($user_id).','.Database::escape_string($friend_id).','.Database::escape_string($status_invitation).',"'.$current_date.'","'.$message_title.'","'.$message_content.'")';
api_sql_query($sql,__FILE__,__LINE__);
Database::query($sql,__FILE__,__LINE__);
return true;
} elseif($row_exist['count']==1) {
$sql_if_exist='SELECT COUNT(*) AS count FROM '.$tbl_message.' WHERE user_sender_id='.Database::escape_string($user_id).' AND user_receiver_id='.Database::escape_string($friend_id).' AND msg_status=7';
$res_if_exist=api_sql_query($sql_if_exist,__FILE__,__LINE__);
$res_if_exist=Database::query($sql_if_exist,__FILE__,__LINE__);
$row_if_exist=Database::fetch_array($res_if_exist,'ASSOC');
if ($row_if_exist['count']==1) {
$sql_if_exist_up='UPDATE '.$tbl_message.'SET msg_status=5 WHERE user_sender_id='.Database::escape_string($user_id).' AND user_receiver_id='.Database::escape_string($friend_id).';';
api_sql_query($sql_if_exist_up,__FILE__,__LINE__);
Database::query($sql_if_exist_up,__FILE__,__LINE__);
return true;
} else {
return false;
@ -232,7 +232,7 @@ class UserFriend extends UserManager {
$status_invitation=5;//status of pending invitation
$tbl_message=Database::get_main_table(TABLE_MAIN_MESSAGE);
$sql='SELECT COUNT(*) as count_message_in_box FROM '.$tbl_message.' WHERE user_receiver_id='.Database::escape_string($user_receiver_id).' AND msg_status=5;';
$res=api_sql_query($sql,__FILE__,__LINE__);
$res=Database::query($sql,__FILE__,__LINE__);
$row=Database::fetch_array($res,'ASSOC');
return $row['count_message_in_box'];
}
@ -246,7 +246,7 @@ class UserFriend extends UserManager {
$list_friend_invitation=array();
$tbl_message=Database::get_main_table(TABLE_MAIN_MESSAGE);
$sql='SELECT user_sender_id,send_date,title,content FROM '.$tbl_message.' WHERE user_receiver_id='.Database::escape_string($user_id).' AND msg_status=5;';
$res=api_sql_query($sql,__FILE__,__LINE__);
$res=Database::query($sql,__FILE__,__LINE__);
while ($row=Database::fetch_array($res,'ASSOC')) {
$list_friend_invitation[]=$row;
}
@ -263,7 +263,7 @@ class UserFriend extends UserManager {
$tbl_message=Database::get_main_table(TABLE_MAIN_MESSAGE);
$msg_status=6;// friend accepted
$sql='UPDATE '.$tbl_message.' SET msg_status='.$msg_status.' WHERE user_sender_id='.Database::escape_string($user_send_id).' AND user_receiver_id='.Database::escape_string($user_receiver_id).';';
api_sql_query($sql,__FILE__,__LINE__);
Database::query($sql,__FILE__,__LINE__);
}
/**
* allow deny invitation
@ -276,7 +276,7 @@ class UserFriend extends UserManager {
$tbl_message=Database::get_main_table(TABLE_MAIN_MESSAGE);
$msg_status=7;
$sql='UPDATE '.$tbl_message.' SET msg_status='.$msg_status.' WHERE user_sender_id='.Database::escape_string($user_send_id).' AND user_receiver_id='.Database::escape_string($user_receiver_id).';';
api_sql_query($sql,__FILE__,__LINE__);
Database::query($sql,__FILE__,__LINE__);
}
/**
* allow attach to group
@ -289,7 +289,7 @@ class UserFriend extends UserManager {
$tbl_user_friend=Database::get_main_table(TABLE_MAIN_USER_FRIEND);
$user_id=api_get_user_id();
$sql='UPDATE '.$tbl_user_friend.' SET relation_type='.Database::escape_string($type_qualify).' WHERE user_id='.Database::escape_string($user_id).' AND friend_user_id='.Database::escape_string($id_friend_qualify).';';
api_sql_query($sql,__FILE__,__LINE__);
Database::query($sql,__FILE__,__LINE__);
}
/**
* Send invitation a your friends

2
main/inc/lib/sortabletable.class.php
Unescape View File

@ -136,6 +136,8 @@ class SortableTable extends HTML_Table
$this->column = isset ($_GET[$this->param_prefix.'column']) ? $_GET[$this->param_prefix.'column'] : $this->column;
$this->direction = isset ($_SESSION[$this->param_prefix.'direction']) ? $_SESSION[$this->param_prefix.'direction'] : $default_order_direction;
$this->direction = isset ($_GET[$this->param_prefix.'direction']) ? $_GET[$this->param_prefix.'direction'] : $this->direction;
//allow to change paginate in multiples tabs
unset($_SESSION[$this->param_prefix.'per_page']);
$this->per_page = isset ($_SESSION[$this->param_prefix.'per_page']) ? $_SESSION[$this->param_prefix.'per_page'] : $default_items_per_page;
$this->per_page = isset ($_GET[$this->param_prefix.'per_page']) ? $_GET[$this->param_prefix.'per_page'] : $this->per_page;
$_SESSION[$this->param_prefix.'per_page'] = $this->per_page;

5
main/messages/inbox.php
Unescape View File

@ -82,12 +82,14 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
$info_delete=array();
/***********************************************/
if ( isset($_GET['form_reply']) ) {
//allow to insert messages
$info_reply=explode(base64_encode('&%ff..x'),$_GET['form_reply']);
$count_reply=count($info_reply);
$button_sent=urldecode($info_reply[4]);
}
/***********************************************/
if ( isset($_GET['form_delete']) ) {
//allow to delete messages
$info_delete=explode(',',$_GET['form_delete']);
$count_delete=(count($info_delete)-1);
}
@ -98,8 +100,7 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
$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);

10
main/messages/new_message.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: new_message.php 20707 2009-05-15 17:58:05Z iflorespaz $
<?php // $Id: new_message.php 20722 2009-05-16 13:22:42Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -156,15 +156,15 @@ 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','onkeyup'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()','autocomplete'=>'off'));
$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()','autocomplete'=>'off','style'=>'padding:0px'));
$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('html','<div id="id_div_search" style="padding:0px" class="message-select-box" >&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','onkeyup'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()','autocomplete'=>'off'));
$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()','autocomplete'=>'off','style'=>'padding:0px'));
$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('html','<div id="id_div_search" style="padding:0px" class="message-select-box" >&nbsp;</div>');
}
$form->addElement('hidden','user_list',0,array('id'=>'user_list'));
}

2
main/social/select_options.php
Unescape View File

@ -7,7 +7,7 @@ $tbl_my_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_my_user_friend = Database :: get_main_table(TABLE_MAIN_USER_FRIEND);
$search=Security::remove_XSS($_POST['search']);
$date_inter=date('Y-m-d H:i:s',time()-120);
$html_form='<select id="id_search_name" name="id_search_name" size="8"" class="message-select-box">';
$html_form='<select id="id_search_name" name="id_search_name" size="8"" style="width:350px;">';
$user_id = api_get_user_id();
$sql = 'SELECT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name ' .
'FROM '.$tbl_my_user_friend.' uf ' .

Write Preview
Loading…
Cancel
Save