From df1808c6c337d02d40de954c2de7bfd58233507e Mon Sep 17 00:00:00 2001
From: Pierre <pierre@hubert.fr>
Date: Sun, 25 Jun 2017 19:11:00 +0200
Subject: [PATCH] Improved conversation get methods

---
 RestControllers/conversationsController.php |  2 +-
 classes/components/conversations.php        | 23 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/RestControllers/conversationsController.php b/RestControllers/conversationsController.php
index c40fb74..ae3b8ea 100644
--- a/RestControllers/conversationsController.php
+++ b/RestControllers/conversationsController.php
@@ -305,7 +305,7 @@ class conversationsController{
 					Rest_fatal_error(401, "Specified user doesn't belongs to the conversation number ".$conversationID." !");
 				
 				//Then we can get the ten las messages of the conversation system
-				$conversationsMessages[$conversationID] = CS::get()->components->conversations->getLastMessages($conversationID, 10);
+				$conversationsMessages["conversation-".$conversationID] = CS::get()->components->conversations->getLastMessages($conversationID, 10);
 			}
 		}
 
diff --git a/classes/components/conversations.php b/classes/components/conversations.php
index e72f976..d171d5c 100644
--- a/classes/components/conversations.php
+++ b/classes/components/conversations.php
@@ -557,8 +557,29 @@ class conversations {
 			$conversationID
 		);
 
+		//Define required fields
+		$requiredFields = array(
+			"ID",
+			"ID_utilisateurs AS ID_user",
+			"image_path",
+			"message",
+			"time_insert"
+		);
+
 		//Try to perform request on the database
-		$messages = CS::get()->db->select($tableName, $conditions, $condVals);
+		$messages = CS::get()->db->select($tableName, $conditions, $condVals, $requiredFields);
+
+		//Process each message
+		array_walk($messages, function(&$item){
+			//Check if image is not null
+			if($item["image_path"] !== null && $item["image_path"] != ""){
+				//Replace image name with full URL
+				$item["image_path"] = path_user_data($item["image_path"]);
+			}
+		});
+
+		//Revert messages order
+		$messages = array_reverse($messages);
 
 		//Return messages
 		return $messages;