Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/inc/lib/message.lib.php

@@ -1076,7 +1076,9 @@ class MessageManager
                 WHERE
                     user_receiver_id = ".$user_id." AND
                     id = '".$message_id."'";
-        Database::query($sql);
+        $result = Database::query($sql);
+
+        return Database::affected_rows($result) > 0;
     }
 
     /**

main/inc/lib/webservices/Rest.php

@@ -19,6 +19,8 @@ class Rest extends WebService
 
     const GET_AUTH = 'authenticate';
     const GET_USER_MESSAGES = 'user_messages';
+    const POST_USER_MESSAGE_READ = 'user_message_read';
+    const POST_USER_MESSAGE_UNREAD = 'user_message_unread';
     const SAVE_GCM_ID = 'gcm_id';
     const GET_USER_COURSES = 'user_courses';
     const GET_PROFILE = 'user_profile';
@@ -922,6 +924,7 @@ class Rest extends WebService
                         'code' => $courseInfo['code'],
                         'directory' => $courseInfo['directory'],
                         'pictureUrl' => $courseInfo['course_image_large'],
+                        'urlPicture' => $courseInfo['course_image_large'],
                         'teachers' => $teachers,
                     ];
                 }

main/inc/lib/webservices/WebService.class.php

@@ -99,4 +99,12 @@ class WebService
             $user->getSalt()
         );
     }
+
+    /**
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
 }

main/webservices/api/v2.php

@@ -58,6 +58,32 @@ try {
             $messages = $restApi->getUserMessages($lastMessageId);
             $restResponse->setData($messages);
             break;
+        case Rest::POST_USER_MESSAGE_READ:
+        case Rest::POST_USER_MESSAGE_UNREAD:
+            $messagesId = isset($_POST['messages']) && is_array($_POST['messages'])
+                ? array_map('intval', $_POST['messages'])
+                : [];
+
+            $messagesId = array_filter($messagesId);
+
+            if (empty($messagesId)) {
+                throw new Exception(get_lang('NoData'));
+            }
+
+            $messageStatus = $action === Rest::POST_USER_MESSAGE_READ ? MESSAGE_STATUS_NEW : MESSAGE_STATUS_UNREAD;
+
+            $data = array_flip($messagesId);
+
+            foreach ($messagesId as $messageId) {
+                $data[$messageId] = MessageManager::update_message_status(
+                    $restApi->getUser()->getId(),
+                    $messageId,
+                    $messageStatus
+                );
+            }
+
+            $restResponse->setData($data);
+            break;
         case Rest::GET_USER_COURSES:
             $courses = $restApi->getUserCourses();
             $restResponse->setData($courses);