flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-10-31 10:27:42 +00:00
Code Issues Releases Wiki Activity

Avoid problem with duplicates numbers on conversations (spaces and no spaces)

Browse Source
This commit is contained in:
Loic Blot 2014-10-23 08:58:16 +00:00
parent 714f0c0d9e
commit a09faa67ad
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controller/smscontroller.php
View File

@ -124,6 +124,9 @@ class SmsController extends Controller {
$phoneNumbers = array(); $phoneNumbers = array();
$msgCount = 0; $msgCount = 0;
// This table will be used to avoid duplicates
$noSpacesPhones = array();
// Contact resolved // Contact resolved
if ($contactName != "" && isset($iContacts[$contactName])) { if ($contactName != "" && isset($iContacts[$contactName])) {
$ctPn = count($iContacts[$contactName]); $ctPn = count($iContacts[$contactName]);
@ -138,7 +141,11 @@ class SmsController extends Controller {
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN); $msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN);
$fmtPNNoSpaces = preg_replace("#[ ]#","", $fmtPN);
if (!in_array($fmtPNNoSpaces, $noSpacesPhones)) {
$phoneNumbers[] = $fmtPN; $phoneNumbers[] = $fmtPN;
$noSpacesPhones[] = $fmtPNNoSpaces;
}
} }
} }
else { else {
@ -148,7 +155,11 @@ class SmsController extends Controller {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN, $lastDate); $messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN, $lastDate);
$msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN); $msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN);
$fmtPNNoSpaces = preg_replace("#[ ]#","", $fmtPN);
if (!in_array($fmtPNNoSpaces, $noSpacesPhones)) {
$phoneNumbers[] = $fmtPN; $phoneNumbers[] = $fmtPN;
$noSpacesPhones[] = $fmtPNNoSpaces;
}
} }
// Order by id (date) // Order by id (date)