flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-07 16:06:15 +00:00
Code Issues Releases Wiki Activity

Prepare deleteConversation handler and remove unreachable code in getConversation

Browse Source
This commit is contained in:
Loic Blot 2015-06-24 06:35:47 +00:00
parent cbe70ac13b
commit b67802a646
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
controller/smscontroller.php
View File

@ -132,12 +132,6 @@ class SmsController extends Controller {
else { else {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $configuredCountry, $lastDate); $messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $configuredCountry, $lastDate);
$msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $phoneNumber, $configuredCountry); $msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $phoneNumber, $configuredCountry);
if(isset($peerNumber[$fmtPN])) {
foreach($peerNumber[$fmtPN] as $cnumber) {
$messages = $messages + $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $cnumber, $configuredCountry, $lastDate);
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $cnumber, $configuredCountry);
}
}
$phoneNumbers[] = PhoneNumberFormatter::format($configuredCountry, $phoneNumber); $phoneNumbers[] = PhoneNumberFormatter::format($configuredCountry, $phoneNumber);
} }
// Order by id (date) // Order by id (date)
@ -161,6 +155,26 @@ class SmsController extends Controller {
* @NoCSRFRequired * @NoCSRFRequired
*/ */
public function deleteConversation ($contact) { public function deleteConversation ($contact) {
$contacts = $this->contactCache->getContacts();
$iContacts = $this->contactCache->getInvertedContacts();
$contactName = "";
// Cache country because of loops
$configuredCountry = $this->configMapper->getCountry();
$fmtPN = PhoneNumberFormatter::format($configuredCountry, $phoneNumber);
if (isset($contacts[$fmtPN])) {
$contactName = $contacts[$fmtPN];
}
// Contact resolved
if ($contactName != "" && isset($iContacts[$contactName])) {
// forall numbers in iContacts
foreach($iContacts[$contactName] as $cnumber) {
}
}
else {
}
return new JSONResponse(array()); return new JSONResponse(array());
} }