From 010acd7adca6da2754456c453bc11f10bb4f012a Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 22 Sep 2016 23:06:22 +0200
Subject: [PATCH] Conversation header CSS fix & unicity fixes for unread
 messages & peerlist last messages Note: for unread message count we need one
 more fix

---
 css/style.css    | 2 +-
 db/smsmapper.php | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/css/style.css b/css/style.css
index 5d6494b..a5567b5 100644
--- a/css/style.css
+++ b/css/style.css
@@ -54,7 +54,7 @@
 
 #app-content-wrapper {
 	padding: 15px;
-	margin-top: 80px;
+	margin-top: 100px;
 	min-height: auto !important;
 }
 
diff --git a/db/smsmapper.php b/db/smsmapper.php
index bef1710..dc9d04c 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -211,7 +211,7 @@ class SmsMapper extends Mapper {
 		$phoneList = array();
 		while ($row = $result->fetchRow()) {
 			$phoneNumber = preg_replace("#[ ]#", "", $row["sms_address"]);
-			if (!in_array($phoneNumber, $phoneList)) {
+			if (!array_key_exists($phoneNumber, $phoneList)) {
 				$phoneList[$phoneNumber] = $row["mx"];
 			}
 			// Maybe duplicate due to spaces in database
@@ -235,10 +235,13 @@ class SmsMapper extends Mapper {
 		$phoneList = array();
 		while ($row = $result->fetchRow()) {
 			$phoneNumber = preg_replace("#[ ]#", "", $row["sms_address"]);
-			if (!in_array($phoneNumber, $phoneList)) {
-				if ($this->getLastReadDateForPhoneNumber($userId, $phoneNumber) < $lastDate) {
+			if ($this->getLastReadDateForPhoneNumber($userId, $row["sms_address"]) < $lastDate) {
+				if (!array_key_exists($phoneNumber, $phoneList)) {
 					$phoneList[$phoneNumber] = $row["ct"];
 				}
+				else {
+					$phoneList[$phoneNumber] += $row["ct"];
+				}
 			}
 		}
 		return $phoneList;