';
$html_items = '';
$user_sender_info = api_get_user_info($topic['user_sender_id']);
- $files_attachments = self::getAttachmentLinkList($topic['id']);
+ $files_attachments = self::getAttachmentLinkList($topic['id'], 0);
$name = $user_sender_info['complete_name'];
$links .= '
';
@@ -2002,12 +2048,12 @@ class MessageManager
/**
* Get array of links (download) for message attachment files.
*
- * @param int $messageId
- * @param string $type message list (inbox/outbox)
+ * @param int $messageId
+ * @param int $type
*
* @return array
*/
- public static function getAttachmentLinkList($messageId, $type = '')
+ public static function getAttachmentLinkList($messageId, $type)
{
$files = self::getAttachmentList($messageId);
// get file attachments by message id
@@ -2025,10 +2071,9 @@ class MessageManager
$comment = !empty($comment) ? ' -
'.$comment.'' : '';
$attachmentLine = $attachIcon.' '.$link.' ('.$size.')'.$comment;
- if ($row_file['comment'] == 'audio_message') {
+ if ($row_file['comment'] === 'audio_message') {
$attachmentLine = '
';
}
-
$list[] = $attachmentLine;
}
}
@@ -2097,23 +2142,72 @@ class MessageManager
}
/**
- * @param string $statusList
- * @param array $keyword
+ * @param string $type
+ * @param string $keyword
* @param array $actions
- * @param string $viewUrl
*
* @return string
*/
- public static function getMessageGrid($statusList, $keyword, $actions = [], $viewUrl = '')
+ public static function getMessageGrid($type, $keyword, $actions = [])
{
- if (empty($statusList)) {
- return '';
+ $html = '';
+ // display sortable table with messages of the current user
+ $table = new SortableTable(
+ 'message_inbox',
+ ['MessageManager', 'getNumberOfMessages'],
+ ['MessageManager', 'getMessageData'],
+ 2,
+ 20,
+ 'DESC'
+ );
+
+ $table->setDataFunctionParams(
+ ['keyword' => $keyword, 'type' => $type, 'actions' => $actions]
+ );
+ $table->set_header(0, '', false, ['style' => 'width:15px;']);
+ $table->set_header(1, get_lang('Messages'), false);
+ $table->set_header(2, get_lang('Date'), true, ['style' => 'width:180px;']);
+ $table->set_header(3, get_lang('Modify'), false, ['style' => 'width:120px;']);
+
+ if (isset($_REQUEST['f']) && $_REQUEST['f'] === 'social') {
+ $parameters['f'] = 'social';
+ $table->set_additional_parameters($parameters);
}
+
+ $defaultActions = [
+ 'delete' => get_lang('DeleteSelectedMessages'),
+ 'mark_as_unread' => get_lang('MailMarkSelectedAsUnread'),
+ 'mark_as_read' => get_lang('MailMarkSelectedAsRead'),
+ ];
+
+ if (!in_array('delete', $actions)) {
+ unset($defaultActions['delete']);
+ }
+ if (!in_array('mark_as_unread', $actions)) {
+ unset($defaultActions['mark_as_unread']);
+ }
+ if (!in_array('mark_as_read', $actions)) {
+ unset($defaultActions['mark_as_read']);
+ }
+
+ $table->set_form_actions($defaultActions);
+
+ $html .= $table->return_table();
+
+ return $html;
+ }
+
+ /**
+ * @param string $keyword
+ *
+ * @return string
+ */
+ public static function inboxDisplay($keyword = '')
+ {
$success = get_lang('SelectedMessagesDeleted');
$success_read = get_lang('SelectedMessagesRead');
$success_unread = get_lang('SelectedMessagesUnRead');
$currentUserId = api_get_user_id();
- $html = '';
if (isset($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
@@ -2127,11 +2221,11 @@ class MessageManager
);
}
}
- $html .= Display::return_message(
- api_xml_http_response_encode($success_unread),
+ Display::addFlash(Display::return_message(
+ $success_unread,
'normal',
false
- );
+ ));
break;
case 'mark_as_read':
if (is_array($_POST['id'])) {
@@ -2143,75 +2237,41 @@ class MessageManager
);
}
}
- $html .= Display::return_message(
- api_xml_http_response_encode($success_read),
+ Display::addFlash(Display::return_message(
+ $success_read,
'normal',
false
- );
+ ));
break;
case 'delete':
foreach ($_POST['id'] as $index => $messageId) {
self::delete_message_by_user_receiver($currentUserId, $messageId);
}
- $html .= Display::return_message(
- api_xml_http_response_encode($success),
+ Display::addFlash(Display::return_message(
+ $success,
'normal',
false
- );
+ ));
break;
case 'deleteone':
- self::delete_message_by_user_receiver($currentUserId, $_GET['id']);
- $html .= Display::return_message(
- api_xml_http_response_encode($success),
- 'confirmation',
- false
- );
+ $result = self::delete_message_by_user_receiver($currentUserId, $_GET['id']);
+ if ($result) {
+ Display::addFlash(
+ Display::return_message(
+ $success,
+ 'confirmation',
+ false
+ )
+ );
+ }
break;
}
+ header('Location: '.api_get_self());
+ exit;
}
- // display sortable table with messages of the current user
- $table = new SortableTable(
- 'message_inbox',
- ['MessageManager', 'getNumberOfMessages'],
- ['MessageManager', 'getMessageData'],
- 2,
- 20,
- 'DESC'
- );
-
- $table->setDataFunctionParams(
- ['keyword' => $keyword, 'message_status' => $statusList, 'actions' => $actions, 'view_url' => $viewUrl]
- );
- $table->set_header(0, '', false, ['style' => 'width:15px;']);
- $table->set_header(1, get_lang('Messages'), false);
- $table->set_header(2, get_lang('Date'), true, ['style' => 'width:180px;']);
- $table->set_header(3, get_lang('Modify'), false, ['style' => 'width:120px;']);
-
- if (isset($_REQUEST['f']) && $_REQUEST['f'] === 'social') {
- $parameters['f'] = 'social';
- $table->set_additional_parameters($parameters);
- }
-
- $defaultActions = [
- 'delete' => get_lang('DeleteSelectedMessages'),
- 'mark_as_unread' => get_lang('MailMarkSelectedAsUnread'),
- 'mark_as_read' => get_lang('MailMarkSelectedAsRead'),
- ];
-
- if (!in_array('delete', $actions)) {
- unset($defaultActions['delete']);
- }
- if (!in_array('mark_as_unread', $actions)) {
- unset($defaultActions['mark_as_unread']);
- }
- if (!in_array('mark_as_read', $actions)) {
- unset($defaultActions['mark_as_read']);
- }
-
- $table->set_form_actions($defaultActions);
-
- $html .= $table->return_table();
+ $actions = ['reply', 'mark_as_unread', 'mark_as_read', 'forward', 'delete'];
+ $html = self::getMessageGrid(self::MESSAGE_TYPE_INBOX, $keyword, $actions);
return $html;
}
@@ -2221,10 +2281,39 @@ class MessageManager
*
* @return string
*/
- public static function inboxDisplay($keyword = '')
+ public static function getPromotedMessagesGrid($keyword)
{
- $actions = ['reply', 'mark_as_unread', 'mark_as_read', 'forward', 'delete'];
- $html = self::getMessageGrid([MESSAGE_STATUS_NEW, MESSAGE_STATUS_UNREAD], $keyword, $actions);
+ $actions = ['delete'];
+ $currentUserId = api_get_user_id();
+
+ $success = get_lang('SelectedMessagesDeleted');
+ if (isset($_REQUEST['action'])) {
+ switch ($_REQUEST['action']) {
+ case 'delete':
+ foreach ($_POST['id'] as $index => $messageId) {
+ self::delete_message_by_user_receiver($currentUserId, $messageId);
+ }
+ Display::addFlash(Display::return_message(
+ $success,
+ 'normal',
+ false
+ ));
+ break;
+ case 'deleteone':
+ self::delete_message_by_user_receiver($currentUserId, $_GET['id']);
+ Display::addFlash(Display::return_message(
+ $success,
+ 'confirmation',
+ false
+ ));
+ break;
+ }
+
+ header('Location: '.api_get_self());
+ exit;
+ }
+
+ $html = self::getMessageGrid(self::MESSAGE_TYPE_PROMOTED, $keyword, $actions);
return $html;
}
@@ -2234,12 +2323,40 @@ class MessageManager
*
* @return string
*/
- public static function getPromotedMessagesGrid($keyword = '')
+ public static function outBoxDisplay($keyword)
{
- //$actions = ['edit', 'delete'];
$actions = ['delete'];
- $url = api_get_path(WEB_CODE_PATH).'social/view_promoted_message.php';
- $html = self::getMessageGrid([MESSAGE_STATUS_PROMOTED], $keyword, $actions, $url);
+
+ $success = get_lang('SelectedMessagesDeleted');
+ $currentUserId = api_get_user_id();
+ if (isset($_REQUEST['action'])) {
+ switch ($_REQUEST['action']) {
+ case 'delete':
+ foreach ($_POST['id'] as $index => $messageId) {
+ self::delete_message_by_user_sender($currentUserId, $messageId);
+ }
+ Display::addFlash(Display::return_message(
+ $success,
+ 'normal',
+ false
+ ));
+
+ break;
+ case 'deleteone':
+ self::delete_message_by_user_sender($currentUserId, $_GET['id']);
+ Display::addFlash(Display::return_message(
+ $success,
+ 'confirmation',
+ false
+ ));
+ break;
+ }
+
+ header('Location: '.api_get_self());
+ exit;
+ }
+
+ $html = self::getMessageGrid(self::MESSAGE_TYPE_OUTBOX, $keyword, $actions);
return $html;
}
@@ -2282,13 +2399,13 @@ class MessageManager
$table = new SortableTable(
'message_outbox',
['MessageManager', 'getNumberOfMessages'],
- ['MessageManager', 'get_message_data_sent'],
+ ['MessageManager', 'getMessageData'],
2,
20,
'DESC'
);
$table->setDataFunctionParams(
- ['keyword' => $keyword, 'message_status' => [MESSAGE_STATUS_OUTBOX]]
+ ['keyword' => $keyword, 'type' => self::MESSAGE_TYPE_OUTBOX]
);
$table->set_header(0, '', false, ['style' => 'width:15px;']);
@@ -2302,49 +2419,9 @@ class MessageManager
return $html;
}
- /**
- * Get the count of the last received messages for a user.
- *
- * @param int $userId The user id
- * @param int $lastId The id of the last received message
- *
- * @return int The count of new messages
- */
- public static function countMessagesFromLastReceivedMessage($userId, $lastId = 0)
- {
- $userId = intval($userId);
- $lastId = intval($lastId);
-
- if (empty($userId)) {
- return 0;
- }
-
- $messagesTable = Database::get_main_table(TABLE_MESSAGE);
-
- $conditions = [
- 'where' => [
- 'user_receiver_id = ?' => $userId,
- 'AND msg_status = ?' => MESSAGE_STATUS_UNREAD,
- 'AND id > ?' => $lastId,
- ],
- ];
-
- $result = Database::select('COUNT(1) AS qty', $messagesTable, $conditions);
-
- if (!empty($result)) {
- $row = current($result);
-
- return $row['qty'];
- }
-
- return 0;
- }
-
/**
* Get the data of the last received messages for a user.
*
- * @deprecated 2.0 Use Chamilo\CoreBundle\Repository\MessageRepository::getFromLastOneReceived
- *
* @param int $userId The user id
* @param int $lastId The id of the last received message
*
@@ -2791,30 +2868,38 @@ class MessageManager
$countLikes = self::countLikesAndDislikes($messageId, $userId);
+ $class = $countLikes['user_liked'] ? 'btn-primary' : 'btn-default';
+
$btnLike = Display::button(
'like',
Display::returnFontAwesomeIcon('thumbs-up', '', true)
.PHP_EOL.'
'.$countLikes['likes'].'',
[
'title' => get_lang('VoteLike'),
- 'class' => 'btn btn-default social-like '.($countLikes['user_liked'] ? 'disabled' : ''),
+ 'class' => 'btn social-like '.$class,
'data-status' => 'like',
'data-message' => $messageId,
'data-group' => $groupId,
]
);
- $btnDislike = Display::button(
- 'like',
- Display::returnFontAwesomeIcon('thumbs-down', '', true)
- .PHP_EOL.'
'.$countLikes['dislikes'].'',
- [
- 'title' => get_lang('VoteDislike'),
- 'class' => 'btn btn-default social-like '.($countLikes['user_disliked'] ? 'disabled' : ''),
- 'data-status' => 'dislike',
- 'data-message' => $messageId,
- 'data-group' => $groupId,
- ]
- );
+
+ $btnDislike = '';
+ if (api_get_configuration_value('disable_dislike_option') === false) {
+ $disabled = $countLikes['user_disliked'] ? 'btn-danger' : 'btn-default';
+
+ $btnDislike = Display::button(
+ 'like',
+ Display::returnFontAwesomeIcon('thumbs-down', '', true)
+ .PHP_EOL.'
'.$countLikes['dislikes'].'',
+ [
+ 'title' => get_lang('VoteDislike'),
+ 'class' => 'btn social-like '.$disabled,
+ 'data-status' => 'dislike',
+ 'data-message' => $messageId,
+ 'data-group' => $groupId,
+ ]
+ );
+ }
return $btnLike.PHP_EOL.$btnDislike;
}
@@ -2838,11 +2923,11 @@ class MessageManager
$sql = "SELECT COUNT(id) as count
FROM $table
WHERE
- user_receiver_id=".$userId." AND
+ user_receiver_id = $userId AND
msg_status = ".MESSAGE_STATUS_UNREAD;
$result = Database::query($sql);
$row = Database::fetch_assoc($result);
- return $row['count'];
+ return (int) $row['count'];
}
}
diff --git a/main/inc/lib/notification.lib.php b/main/inc/lib/notification.lib.php
index 5d5e384d41..ed76207e6a 100644
--- a/main/inc/lib/notification.lib.php
+++ b/main/inc/lib/notification.lib.php
@@ -489,9 +489,11 @@ class Notification extends Model
return false;
}
- $content = str_replace(['
', '
', '
'], "\n", $content);
$content = strip_tags($content);
- $content = html_entity_decode($content, ENT_QUOTES);
+ $content = explode("\n", $content);
+ $content = array_map('trim', $content);
+ $content = array_filter($content);
+ $content = implode(PHP_EOL, $content);
$gcmRegistrationIds = [];
foreach ($userIds as $userId) {
@@ -523,6 +525,12 @@ class Notification extends Model
'title' => $title,
'message' => $content,
],
+ 'notification' => [
+ 'title' => $title,
+ 'body' => $content,
+ ],
+ 'collapse_key' => get_lang('Messages'),
+ 'sound' => true,
]);
$ch = curl_init();
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 3b3c64d80f..b4a626dbf1 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -1,6 +1,8 @@
[MESSAGE_STATUS_UNREAD]]);
+ $count_unread_message = MessageManager::getCountNewMessagesFromDB(api_get_user_id());
$count_unread_message = !empty($count_unread_message) ? Display::badge($count_unread_message) : null;
$number_of_new_messages_of_friend = self::get_message_number_invitation_by_user_id(api_get_user_id());
@@ -1834,14 +1836,14 @@ class SocialManager extends UserManager
}
$formattedList .= '