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

Minor - format code.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent e651ecd76a
commit 494b612709
2 changed files with 30 additions and 17 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. 33
      main/inc/lib/message.lib.php
  2. 14
      main/messages/view_message.php

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

@ -852,21 +852,28 @@ class MessageManager
if ($source == 'outbox') {
if (isset($message_id) && is_numeric($message_id)) {
$query = "SELECT * FROM $table_message
WHERE user_sender_id=".api_get_user_id()." AND id=".$message_id." AND msg_status=4;";
WHERE
user_sender_id = ".api_get_user_id()." AND
id = ".$message_id." AND
msg_status = 4;";
$result = Database::query($query);
$path = 'outbox.php';
}
} else {
if (is_numeric($message_id) && !empty($message_id)) {
$query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."'
WHERE user_receiver_id=".api_get_user_id()." AND id='".$message_id."';";
$query = "UPDATE $table_message SET
msg_status = '".MESSAGE_STATUS_NEW."'
WHERE
user_receiver_id=".api_get_user_id()." AND
id='".$message_id."'";
Database::query($query);
$query = "SELECT * FROM $table_message
WHERE msg_status<>4 AND user_receiver_id=".api_get_user_id()." AND id='".$message_id."';";
WHERE
msg_status<>4 AND
user_receiver_id=".api_get_user_id()." AND
id='".$message_id."'";
$result = Database::query($query);
}
$path = 'inbox.php';
}
$row = Database::fetch_array($result, 'ASSOC');
$user_sender_id = $row['user_sender_id'];
@ -928,12 +935,16 @@ class MessageManager
$social_link = 'f=social';
}
if ($source == 'outbox') {
$message_content .= '<a href="outbox.php?'.$social_link.'">'.Display::return_icon('back.png', get_lang('ReturnToOutbox')).'</a> &nbsp';
$message_content .= '<a href="outbox.php?'.$social_link.'">'.
Display::return_icon('back.png', get_lang('ReturnToOutbox')).'</a> &nbsp';
} else {
$message_content .= '<a href="inbox.php?'.$social_link.'">'.Display::return_icon('back.png', get_lang('ReturnToInbox')).'</a> &nbsp';
$message_content .= '<a href="new_message.php?re_id='.$message_id.'&'.$social_link.'">'.Display::return_icon('message_reply.png', get_lang('ReplyToMessage')).'</a> &nbsp';
$message_content .= '<a href="inbox.php?'.$social_link.'">'.
Display::return_icon('back.png', get_lang('ReturnToInbox')).'</a> &nbsp';
$message_content .= '<a href="new_message.php?re_id='.$message_id.'&'.$social_link.'">'.
Display::return_icon('message_reply.png', get_lang('ReplyToMessage')).'</a> &nbsp';
}
$message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>&nbsp';
$message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.
Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>&nbsp';
$message_content .='</div></td>
<td width=10></td>
@ -949,8 +960,6 @@ class MessageManager
public static function show_message_box_sent()
{
$table_message = Database::get_main_table(TABLE_MESSAGE);
$tbl_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT);
$message_id = '';
if (is_numeric($_GET['id_send'])) {
$query = "SELECT * FROM $table_message

14
main/messages/view_message.php
Unescape View File

@ -28,12 +28,16 @@ if (isset($_GET['f']) && $_GET['f']=='social') {
$social_right_content .= '<div class="actions">';
if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
}
if (api_get_setting('allow_message_tool') == 'true') {
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
Display::return_icon('inbox.png',get_lang('Inbox')).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
Display::return_icon('outbox.png',get_lang('Outbox')).'</a>';
}
$social_right_content .= '</div>';
}
@ -59,7 +63,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
$message .='<div class="span9">';
}
//MAIN CONTENT
$message .= MessageManager::show_message_box($id_message,$source);
$message .= MessageManager::show_message_box($id_message, $source);
if (api_get_setting('allow_social_tool') == 'true') {
$message .='</div>';

Write Preview
Loading…
Cancel
Save