From 71d6ed693b1bd045a7c9d8e290a04e54069fe80d Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 5 Oct 2014 08:54:44 +0000
Subject: [PATCH] Contact names are now get with peerlist

---
 appinfo/ocsmsapp.php         | 14 +++++++++++---
 controller/smscontroller.php | 19 +++++++++++++++++--
 js/script.js                 |  1 -
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/appinfo/ocsmsapp.php b/appinfo/ocsmsapp.php
index 7d9463d..b0933d8 100644
--- a/appinfo/ocsmsapp.php
+++ b/appinfo/ocsmsapp.php
@@ -87,9 +87,17 @@ class OcSmsApp extends App {
 			$result = $cm->search('',array('FN'));
 			foreach ($result as $r) {
 				if (isset ($r["TEL"])) {
-					self::$contacts[$r["TEL"]] = $r["FN"];
-					$phoneId = preg_replace("#[ ]#", "", $r["TEL"]);
-					self::$contacts[$phoneId] = $r["FN"];
+					$phoneIds = $r["TEL"];
+					if (is_array($phoneIds)) {
+						$countPhone = count($phoneIds);
+						for ($i=0; $i<$countPhone; $i++) {
+							$phoneNb = preg_replace("#[ ]#", "", $phoneIds[$i]);
+							self::$contacts[$phoneNb] = $r["FN"];
+						}
+					}
+					else {
+						self::$contacts[$phoneIds] = $r["FN"];
+					}
 				}
 			}
 		}
diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index 06eda39..20f4ea3 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -71,8 +71,17 @@ class SmsController extends Controller {
 	 */
 	public function retrieveAllPeers () {
 		$phoneList = $this->smsMapper->getAllPeersPhoneNumbers($this->userId);
+		$contactsSrc = $this->app->getContacts();
+		$contacts = array();
+
+		$countPhone = count($phoneList);
+		for ($i=0; $i < $countPhone; $i++) {
+			if (isset($contactsSrc[$phoneList[$i]])) {
+				$contacts[$phoneList[$i]] = $contactsSrc[$phoneList[$i]];
+			}
+		}
 		// @ TODO: filter correctly
-		return new JSONResponse(array("phonelist" => $phoneList));
+		return new JSONResponse(array("phonelist" => $phoneList, "contacts" => $contacts));
 	}
 
 	/**
@@ -81,8 +90,14 @@ class SmsController extends Controller {
 	 */
 	public function getConversation ($phoneNumber, $lastDate = 0) {
 		$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
+		$contacts = $this->app->getContacts();
+		$contactName = "";
+		if (isset($contacts[$phoneNumber])) {
+			$contactName = $contacts[$phoneNumber];
+		}
+		
 		// @ TODO: filter correctly
-		return new JSONResponse(array("conversation" => $messages, "contacts" => $this->app->getContacts()));
+		return new JSONResponse(array("conversation" => $messages, "contactName" => $contactName));
 	}
 
 	/**
diff --git a/js/script.js b/js/script.js
index a6a3c71..cfc43cf 100644
--- a/js/script.js
+++ b/js/script.js
@@ -14,7 +14,6 @@ var selectedConversation = null;
 var curPhoneNumber = null;
 var lastMsgDate = 0;
 
-// Source: http://www.sitepoint.com/url-parameters-jquery/
 $.urlParam = function(name){
 	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
 	if (results == null) {