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

Now fix the thing into conversations

Browse Source
This commit is contained in:
Loic Blot 2014-10-22 12:48:35 +00:00
parent 621383e996
commit 74511c4c60
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
controller/smscontroller.php
View File

@ -110,8 +110,11 @@ class SmsController extends Controller {
public function getConversation ($phoneNumber, $lastDate = 0) { public function getConversation ($phoneNumber, $lastDate = 0) {
$contacts = $this->app->getContacts(); $contacts = $this->app->getContacts();
$contactName = ""; $contactName = "";
if (isset($contacts[$phoneNumber])) {
$contactName = $contacts[$phoneNumber]; // Add slashes to index properly
$fmtPN = preg_replace("#[ ]#","/", $phoneNumber);
if (isset($contacts[$fmtPN])) {
$contactName = $contacts[$fmtPN];
} }
$messages = array(); $messages = array();
@ -128,7 +131,10 @@ class SmsController extends Controller {
for ($i=0; $i < $ctPn; $i++) { for ($i=0; $i < $ctPn; $i++) {
$messages = $messages + $messages = $messages +
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i], $lastDate); $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i], $lastDate);
$phoneNumbers[] = $iContacts[$contactName][$i];
// Remove slashes
$fmtPN = preg_replace("#[/]#"," ", $iContacts[$contactName][$i]);
$phoneNumbers[] = $fmtPN;
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i]); $msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i]);
} }
@ -136,7 +142,10 @@ class SmsController extends Controller {
else { else {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate); $messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
$msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $phoneNumber); $msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $phoneNumber);
$phoneNumbers[] = $phoneNumber;
// remove slashes
$fmtPN = preg_replace("#[/]#"," ", $phoneNumber);
$phoneNumbers[] = $fmtPN;
} }
// Order by id (date) // Order by id (date)