flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-11 16:32:55 +00:00
Code Issues Releases Wiki Activity

contrainer for message count (need tests)

Browse Source
This commit is contained in:
Loïc Blot (@U-Exp)
2014-10-13 19:39:55 +02:00
parent 4420139285
commit 00d157ea2c
3 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/smscontroller.php
+13 -18
View File
@@ -115,31 +115,26 @@ class SmsController extends Controller {
$messages = array();
$phoneNumbers = array();
$msgCount = 0;
$iContacts = $this->app->getInvertedContacts();
// Contact resolved
if ($contactName != "") {
$iContacts = $this->app->getInvertedContacts();
$messages = array();
if ($contactName != "" && isset($iContacts[$contactName])) {
$ctPn = count($iContacts[$contactName]);
// If there is iContacts (this must be)
if (isset($iContacts[$contactName])) {
$ctPn = count($iContacts[$contactName]);
// We merge each message list into global messagelist
for ($i=0; $i < $ctPn; $i++) {
$messages = $messages +
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i], $lastDate);
$phoneNumbers[] = $iContacts[$contactName][$i];
// We merge each message list into global messagelist
for ($i=0; $i < $ctPn; $i++) {
$messages = $messages +
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i], $lastDate);
$phoneNumbers[] = $iContacts[$contactName][$i];
}
}
// This case mustn't be reached, but add it.
else {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
$phoneNumbers[] = $phoneNumber;
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i]);
}
}
else {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
$msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $phoneNumber);
$phoneNumbers[] = $phoneNumber;
}
@@ -147,7 +142,7 @@ class SmsController extends Controller {
ksort($messages);
// @ TODO: filter correctly
return new JSONResponse(array("conversation" => $messages, "contactName" => $contactName, "phoneNumbers" => $phoneNumbers));
return new JSONResponse(array("conversation" => $messages, "contactName" => $contactName, "phoneNumbers" => $phoneNumbers, "msgCount" => $msgCount));
}
/**