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

Fixing invitation save date

Browse Source
skala
Julio Montoya 14 years ago
parent 039fd65657
commit 0a75e6004c
4 changed files with 24 additions and 26 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. 12
      main/inc/lib/message.lib.php
  2. 25
      main/inc/lib/social.lib.php
  3. 2
      main/messages/send_message.php
  4. 11
      main/social/invitations.php

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

@ -240,6 +240,8 @@ class MessageManager
//Just in case we replace the and \n and \n\r while saving in the DB
$content = str_replace(array("\n", "\n\r"), '<br />', $content);
$now = api_get_utc_datetime();
if (!empty($receiver_user_id) || !empty($group_id)) {
// message for user friend
@ -250,12 +252,12 @@ class MessageManager
//message in inbox for user friend
//@todo it's possible to edit a message? yes, only for groups
if ($edit_message_id) {
$query = " UPDATE $table_message SET update_date = '".api_get_utc_datetime()."', content = '$clean_content' WHERE id = '$edit_message_id' ";
$query = " UPDATE $table_message SET update_date = '".$now."', content = '$clean_content' WHERE id = '$edit_message_id' ";
$result = Database::query($query);
$inbox_last_id = $edit_message_id;
} else {
$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
"VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$clean_subject','$clean_content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
"VALUES ('$user_sender_id', '$receiver_user_id', '1', '".$now."','$clean_subject','$clean_content','$group_id','$parent_id', '".$now."')";
$result = Database::query($query);
$inbox_last_id = Database::insert_id();
}
@ -274,7 +276,7 @@ class MessageManager
if (empty($group_id)) {
//message in outbox for user friend or group
$sql = "INSERT INTO $table_message (user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
" VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$clean_subject','$clean_content', '$group_id', '$parent_id', '".api_get_utc_datetime()."')";
" VALUES ('$user_sender_id', '$receiver_user_id', '4', '".$now."','$clean_subject','$clean_content', '$group_id', '$parent_id', '".$now."')";
$rs = Database::query($sql);
$outbox_last_id = Database::insert_id();
@ -289,9 +291,7 @@ class MessageManager
}
}
}
//Load user settings
$notification = new Notification();
if (empty($group_id)) {

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

@ -173,19 +173,19 @@ class SocialManager extends UserManager {
* @author isaac flores paz
* @author Julio Montoya <gugli100@gmail.com> Cleaning code
*/
public static function send_invitation_friend ($user_id, $friend_id, $message_title, $message_content) {
public static function send_invitation_friend($user_id, $friend_id, $message_title, $message_content) {
$tbl_message = Database::get_main_table(TABLE_MAIN_MESSAGE);
$user_id = intval($user_id);
$friend_id = intval($friend_id);
//Just in case we replace the and \n and \n\r while saving in the DB
$message_content = str_replace(array("\n", "\n\r"), '<br />', $message_content);
$message_content = str_replace(array("\n", "\n\r"), '<br />', $message_content);
$clean_message_title = Database::escape_string($message_title);
$clean_message_content = Database::escape_string($message_content);
$current_date = date('Y-m-d H:i:s',time());
$now = api_get_utc_datetime();
$sql_exist='SELECT COUNT(*) AS count FROM '.$tbl_message.' WHERE user_sender_id='.$user_id.' AND user_receiver_id='.$friend_id.' AND msg_status IN(5,6,7);';
$res_exist = Database::query($sql_exist);
@ -194,7 +194,7 @@ class SocialManager extends UserManager {
if ($row_exist['count']==0) {
$sql=' INSERT INTO '.$tbl_message.'(user_sender_id,user_receiver_id,msg_status,send_date,title,content)
VALUES('.$user_id.','.$friend_id.','.MESSAGE_STATUS_INVITATION_PENDING.',"'.$current_date.'","'.$clean_message_title.'","'.$clean_message_content.'") ';
VALUES('.$user_id.','.$friend_id.','.MESSAGE_STATUS_INVITATION_PENDING.',"'.$now.'","'.$clean_message_title.'","'.$clean_message_content.'") ';
Database::query($sql);
$sender_info = api_get_user_info($user_id);
@ -238,10 +238,10 @@ class SocialManager extends UserManager {
*/
public static function get_list_invitation_of_friends_by_user_id ($user_id) {
$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='.intval($user_id).' AND msg_status = '.MESSAGE_STATUS_INVITATION_PENDING;
$res=Database::query($sql);
while ($row=Database::fetch_array($res,'ASSOC')) {
$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='.intval($user_id).' AND msg_status = '.MESSAGE_STATUS_INVITATION_PENDING;
$res = Database::query($sql);
while ($row = Database::fetch_array($res,'ASSOC')) {
$list_friend_invitation[]=$row;
}
return $list_friend_invitation;
@ -311,13 +311,14 @@ class SocialManager extends UserManager {
* @param void
* @return string message invitation
*/
public static function send_invitation_friend_user ($userfriend_id, $subject_message = '', $content_message = '') {
public static function send_invitation_friend_user($userfriend_id, $subject_message = '', $content_message = '') {
global $charset;
//$id_user_friend=array();
$user_info = array();
$user_info = api_get_user_info($userfriend_id);
$succes = get_lang('MessageSentTo');
$succes.= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
if (isset($subject_message) && isset($content_message) && isset($userfriend_id)) {
$send_message = MessageManager::send_message($userfriend_id, $subject_message, $content_message);
if ($send_message) {

2
main/messages/send_message.php
Unescape View File

@ -7,7 +7,7 @@
* Code
*/
$language_file = array('registration','messages','userInfo','admin');
$cidReset=true;
$cidReset = true;
require_once '../inc/global.inc.php';
if (api_is_anonymous()) {

11
main/social/invitations.php
Unescape View File

@ -138,8 +138,8 @@ echo '<div id="social-content">';
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
$user_info = api_get_user_info($sender_user_id);
$title = Security::remove_XSS($invitation['title']);
$content = Security::remove_XSS($invitation['content']);
$date = $invitation['send_date'];
$content = Security::remove_XSS($invitation['content']);
$date = api_convert_and_format_date($invitation['send_date'], DATE_TIME_FORMAT_LONG);
?>
<table cellspacing="0" border="0">
<tbody>
@ -184,7 +184,7 @@ echo '<div id="social-content">';
$title = Security::remove_XSS($invitation['title']);
$content = Security::remove_XSS($invitation['content']);
$date = $invitation['send_date'];
$date = api_convert_and_format_date($invitation['send_date'], $invitation['send_date'], DATE_TIME_FORMAT_LONG);
?>
<table cellspacing="0" border="0">
<tbody>
@ -222,13 +222,10 @@ echo '<div id="social-content">';
$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'&nbsp;&nbsp;'.get_lang('AcceptInvitation').'</a>';
$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'&nbsp;&nbsp;'.get_lang('DenyInvitation').'</a>';
$invitation['description'] = cut($invitation['description'],220,true);
//$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
//$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>';
$new_invitation[]=$invitation;
}
Display::display_sortable_grid('waiting_user', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true));
}
}
echo '</div>';
echo '</div>';
Display::display_footer();

Write Preview
Loading…
Cancel
Save