|
@@ -24,7 +24,8 @@ class MessageManager
|
|
|
$userlist = UserManager::whoIsOnline(0, $count, null, null, 30, true);
|
|
|
$online_user_list = array();
|
|
|
foreach ($userlist as $user_id) {
|
|
|
- $online_user_list[$user_id] = GetFullUserName($user_id).($current_user_id == $user_id ? (" (".get_lang('Myself').")") : (""));
|
|
|
+ $userInfo = api_get_user_info($user_id);
|
|
|
+ $online_user_list[$user_id] = $userInfo['complete_name'].($current_user_id == $user_id ? (" (".get_lang('Myself').")") : (""));
|
|
|
}
|
|
|
|
|
|
return $online_user_list;
|
|
@@ -37,24 +38,25 @@ class MessageManager
|
|
|
public static function display_success_message($uid)
|
|
|
{
|
|
|
$socialExist = Session::read('social_exist');
|
|
|
+ $userInfo = api_get_user_info($uid);
|
|
|
if (isset($socialExist) && $socialExist === true) {
|
|
|
if (api_get_setting('social.allow_social_tool') == 'true' &&
|
|
|
api_get_setting('message.allow_message_tool') == 'true'
|
|
|
) {
|
|
|
$success = get_lang('MessageSentTo').
|
|
|
" <b>".
|
|
|
- GetFullUserName($uid).
|
|
|
+ $userInfo['complete_name'].
|
|
|
"</b>";
|
|
|
} else {
|
|
|
$success = get_lang('MessageSentTo').
|
|
|
" <b>".
|
|
|
- GetFullUserName($uid).
|
|
|
+ $userInfo['complete_name'].
|
|
|
"</b>";
|
|
|
}
|
|
|
} else {
|
|
|
$success = get_lang('MessageSentTo').
|
|
|
" <b>".
|
|
|
- GetFullUserName($uid).
|
|
|
+ $userInfo['complete_name'].
|
|
|
"</b>";
|
|
|
}
|
|
|
|
|
@@ -167,8 +169,13 @@ class MessageManager
|
|
|
if (isset($_GET['f']) && $_GET['f'] == 'social') {
|
|
|
$link = '&f=social';
|
|
|
}
|
|
|
- $message[1] = '<a '.$class.' href="view_message.php?id='.$result[0].$link.'">'.$result[2].'</a><br />'.GetFullUserName(($result[1]));
|
|
|
- $message[3] = '<a href="new_message.php?re_id='.$result[0].$link.'">'.Display::return_icon('message_reply.png', get_lang('ReplyToMessage')).'</a>'.
|
|
|
+
|
|
|
+ $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[3] = '<a href="new_message.php?re_id='.$result[0].$link.'">'.
|
|
|
+ Display::return_icon('message_reply.png', get_lang('ReplyToMessage')).'</a>'.
|
|
|
' <a onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" href="inbox.php?action=deleteone&id='.$result[0].$link.'">'.Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>';
|
|
|
|
|
|
$message[2] = api_convert_and_format_date($result[3], DATE_TIME_FORMAT_LONG); //date stays the same
|
|
@@ -892,8 +899,11 @@ class MessageManager
|
|
|
$result[2] = Security::remove_XSS($result[2]);
|
|
|
|
|
|
if ($request === true) {
|
|
|
- $message[1] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.GetFullUserName($result[4]).'</a>';
|
|
|
- $message[2] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.str_replace("\\", "", $result[2]).'</a>';
|
|
|
+ $userInfo = api_get_user_info($result[4]);
|
|
|
+ $message[1] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.
|
|
|
+ $userInfo['complete_name'].'</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 onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>';
|
|
@@ -902,7 +912,9 @@ class MessageManager
|
|
|
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 />'.GetFullUserName($result[4]);
|
|
|
+ $userInfo = api_get_user_info($result[4]);
|
|
|
+ $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[2] = '<a '.$class.' onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].$link.'">'.$result[2].'</a>';
|
|
|
$message[2] = api_convert_and_format_date($result[3], DATE_TIME_FORMAT_LONG); //date stays the same
|
|
|
$message[3] = '<a href="outbox.php?action=deleteone&id='.$result[0].'&'.$link.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" >'.Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>';
|