|
@@ -147,7 +147,6 @@ class MessageManager
|
|
|
LIMIT $from, $number_of_items";
|
|
|
|
|
|
$sql_result = Database::query($sql);
|
|
|
- $i = 0;
|
|
|
$message_list = array();
|
|
|
|
|
|
$newMessageLink = api_get_path(WEB_CODE_PATH).'messages/new_message.php';
|
|
@@ -161,27 +160,23 @@ class MessageManager
|
|
|
} else {
|
|
|
$class = 'class = "read"';
|
|
|
}
|
|
|
- $link = '';
|
|
|
- if (isset($_GET['f']) && $_GET['f'] == 'social') {
|
|
|
- $link = '&f=social';
|
|
|
- }
|
|
|
|
|
|
$userInfo = api_get_user_info($result[1]);
|
|
|
- $message[1] = '<a '.$class.' href="view_message.php?id='.$result[0].$link.'">'.$result[2].'</a><br />'.$userInfo['complete_name'];
|
|
|
+ $message[1] = '<a '.$class.' href="view_message.php?id='.$result[0].'">'.$result[2].'</a><br />'.$userInfo['complete_name_with_username'];
|
|
|
|
|
|
$message[3] =
|
|
|
Display::url(
|
|
|
Display::returnFontAwesomeIcon('reply', 2),
|
|
|
- $newMessageLink.'?re_id='.$result[0].$link,
|
|
|
+ $newMessageLink.'?re_id='.$result[0],
|
|
|
['title' => get_lang('ReplyToMessage') ]
|
|
|
).
|
|
|
' '.
|
|
|
Display::url(
|
|
|
Display::returnFontAwesomeIcon('share', 2),
|
|
|
- $newMessageLink.'?forward_id='.$result[0].$link,
|
|
|
+ $newMessageLink.'?forward_id='.$result[0],
|
|
|
['title' => get_lang('ForwardMessage') ]
|
|
|
).
|
|
|
- ' <a title="'.addslashes(get_lang('DeleteMessage')).'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" href="inbox.php?action=deleteone&id='.$result[0].$link.'">'.
|
|
|
+ ' <a title="'.addslashes(get_lang('DeleteMessage')).'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" href="inbox.php?action=deleteone&id='.$result[0].'">'.
|
|
|
Display::returnFontAwesomeIcon('trash', 2).'</a>';
|
|
|
|
|
|
$message[2] = api_convert_and_format_date($result[3], DATE_TIME_FORMAT_LONG); //date stays the same
|
|
@@ -189,7 +184,6 @@ class MessageManager
|
|
|
$message[$key] = api_xml_http_response_encode($value);
|
|
|
}
|
|
|
$message_list[] = $message;
|
|
|
- $i++;
|
|
|
}
|
|
|
|
|
|
return $message_list;
|
|
@@ -1026,19 +1020,15 @@ class MessageManager
|
|
|
$result[2] = Security::remove_XSS($result[2]);
|
|
|
$userInfo = api_get_user_info($result[4]);
|
|
|
if ($request === true) {
|
|
|
- $message[1] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.$userInfo['complete_name'].'</a>';
|
|
|
+ $message[1] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.$userInfo['complete_name_with_username'].'</a>';
|
|
|
$message[2] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.str_replace("\\", "", $result[2]).'</a>';
|
|
|
$message[3] = api_convert_and_format_date($result[3], DATE_TIME_FORMAT_LONG); //date stays the same
|
|
|
$message[4] = ' <a title="'.addslashes(get_lang('DeleteMessage')).'" onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)" >'.
|
|
|
Display::returnFontAwesomeIcon('trash', 2).'</a>';
|
|
|
} else {
|
|
|
- $link = '';
|
|
|
- if (isset($_GET['f']) && $_GET['f'] == 'social') {
|
|
|
- $link = '&f=social';
|
|
|
- }
|
|
|
- $message[1] = '<a '.$class.' onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].$link.'">'.$result[2].'</a><br />'.$userInfo['complete_name'];
|
|
|
+ $message[1] = '<a '.$class.' onclick="show_sent_message('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].'">'.$result[2].'</a><br />'.$userInfo['complete_name_with_username'];
|
|
|
$message[2] = api_convert_and_format_date($result[3], DATE_TIME_FORMAT_LONG); //date stays the same
|
|
|
- $message[3] = '<a title="'.addslashes(get_lang('DeleteMessage')).'" href="outbox.php?action=deleteone&id='.$result[0].'&'.$link.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" >'.
|
|
|
+ $message[3] = '<a title="'.addslashes(get_lang('DeleteMessage')).'" href="outbox.php?action=deleteone&id='.$result[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" >'.
|
|
|
Display::returnFontAwesomeIcon('trash', 2).'</a>';
|
|
|
}
|
|
|
|
|
@@ -1130,10 +1120,8 @@ class MessageManager
|
|
|
|
|
|
$title = Security::remove_XSS($row['title'], STUDENT, true);
|
|
|
$content = Security::remove_XSS($row['content'], STUDENT, true);
|
|
|
-
|
|
|
-
|
|
|
$from_user = api_get_user_info($user_sender_id);
|
|
|
- $name = $from_user['complete_name'];
|
|
|
+ $name = $from_user['complete_name_with_username'];
|
|
|
$message_content = Display::page_subheader(str_replace("\\", "", $title));
|
|
|
$user_image = '';
|
|
|
if (api_get_setting('allow_social_tool') == 'true') {
|
|
@@ -1155,7 +1143,7 @@ class MessageManager
|
|
|
$message_content .= '<ul class="list-message">';
|
|
|
$message_content .= '<li>'.$user_image.'</li>';
|
|
|
$message_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> ';
|
|
|
- $message_content .= api_strtolower(get_lang('To')).' <b>'.$receiverUserInfo['complete_name'].'</b></li>';
|
|
|
+ $message_content .= api_strtolower(get_lang('To')).' <b>'.$receiverUserInfo['complete_name_with_username'].'</b></li>';
|
|
|
$message_content .= '<li>'.Display::dateToStringAgoAndLongDate($row['send_date']).'</li>';
|
|
|
$message_content .= '</ul>';
|
|
|
$message_content .= '</div>';
|
|
@@ -1842,13 +1830,8 @@ class MessageManager
|
|
|
*/
|
|
|
public static function outbox_display($keyword = '')
|
|
|
{
|
|
|
- $social_link = false;
|
|
|
- if (isset($_REQUEST['f']) && $_REQUEST['f'] == 'social') {
|
|
|
- $social_link = 'f=social';
|
|
|
- }
|
|
|
-
|
|
|
Session::write('message_sent_search_keyword', $keyword);
|
|
|
- $success = get_lang('SelectedMessagesDeleted').' </b><br /><a href="outbox.php?'.$social_link.'">'.get_lang('BackToOutbox').'</a>';
|
|
|
+ $success = get_lang('SelectedMessagesDeleted').' </b><br /><a href="outbox.php">'.get_lang('BackToOutbox').'</a>';
|
|
|
|
|
|
$html = null;
|
|
|
if (isset($_REQUEST['action'])) {
|
|
@@ -1883,8 +1866,6 @@ class MessageManager
|
|
|
'DESC'
|
|
|
);
|
|
|
|
|
|
- $parameters['f'] = isset($_GET['f']) && $_GET['f'] == 'social' ? 'social' : null;
|
|
|
- $table->set_additional_parameters($parameters);
|
|
|
$table->set_header(0, '', false, array('style' => 'width:15px;'));
|
|
|
$table->set_header(1, get_lang('Messages'), false);
|
|
|
$table->set_header(2, get_lang('Date'), true, array('style' => 'width:180px;'));
|