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

smscontroller::removeConversation link with smsmapper::removeMessagesForPhoneNumber. We need to drop messages now

Browse Source
This commit is contained in:
Loic Blot 2015-06-24 06:40:03 +00:00
parent 4852fa3675
commit 76b0ae3912
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/smscontroller.php
View File

@ -171,9 +171,11 @@ class SmsController extends Controller {
if ($contactName != "" && isset($iContacts[$contactName])) { if ($contactName != "" && isset($iContacts[$contactName])) {
// forall numbers in iContacts // forall numbers in iContacts
foreach($iContacts[$contactName] as $cnumber) { foreach($iContacts[$contactName] as $cnumber) {
$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $cnumber);
} }
} }
else { else {
$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $phoneNumber);
} }
return new JSONResponse(array()); return new JSONResponse(array());
} }

11
db/smsmapper.php
View File

@ -85,7 +85,7 @@ class SmsMapper extends Mapper {
$query = \OCP\DB::prepare('SELECT max(sms_date) as mx FROM ' . $query = \OCP\DB::prepare('SELECT max(sms_date) as mx FROM ' .
'*PREFIX*ocsms_smsdatas WHERE user_id = ?'); '*PREFIX*ocsms_smsdatas WHERE user_id = ?');
$result = $query->execute(array($userId)); $result = $query->execute(array($userId));
if ($row = $result->fetchRow()) { if ($row = $result->fetchRow()) {
return $row["mx"]; return $row["mx"];
} }
@ -173,11 +173,14 @@ class SmsMapper extends Mapper {
return $cnt; return $cnt;
} }
public function removeMessagesForPhoneNumber ($userId, $phoneNumber) {
}
public function getLastMessageTimestampForAllPhonesNumbers ($userId, $order = true) { public function getLastMessageTimestampForAllPhonesNumbers ($userId, $order = true) {
$sql = 'SELECT sms_address,MAX(sms_date) as mx FROM ' . $sql = 'SELECT sms_address,MAX(sms_date) as mx FROM ' .
'*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_mailbox IN (?,?) ' . '*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_mailbox IN (?,?) ' .
'GROUP BY sms_address'; 'GROUP BY sms_address';
if ($order === true) { if ($order === true) {
$sql .= ' ORDER BY mx DESC'; $sql .= ' ORDER BY mx DESC';
} }
@ -201,7 +204,7 @@ class SmsMapper extends Mapper {
$sql = 'SELECT sms_address,count(sms_date) as ct FROM ' . $sql = 'SELECT sms_address,count(sms_date) as ct FROM ' .
'*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_mailbox IN (?,?) ' . '*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_mailbox IN (?,?) ' .
'AND sms_date > ? GROUP BY sms_address'; 'AND sms_date > ? GROUP BY sms_address';
$query = \OCP\DB::prepare($sql); $query = \OCP\DB::prepare($sql);
$result = $query->execute(array($userId, 0, 1, $ld)); $result = $query->execute(array($userId, 0, 1, $ld));
@ -218,7 +221,7 @@ class SmsMapper extends Mapper {
public function getLastReadDate ($userId) { public function getLastReadDate ($userId) {
$sql = 'SELECT MAX(datavalue) as mx FROM ' . $sql = 'SELECT MAX(datavalue) as mx FROM ' .
'*PREFIX*ocsms_user_datas WHERE user_id = ?'; '*PREFIX*ocsms_user_datas WHERE user_id = ?';
$query = \OCP\DB::prepare($sql); $query = \OCP\DB::prepare($sql);
$result = $query->execute(array($userId)); $result = $query->execute(array($userId));