1
0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-07 07:56:23 +00:00

Fix use of insert statement without named parameter. Convert SMS upload/insert statement to NC14 compatible. (#274)

This commit is contained in:
Matt Amos 2018-10-01 19:20:51 +01:00 committed by Loïc Blot
parent 5b72503296
commit 0e99d33f9e
2 changed files with 17 additions and 15 deletions

View File

@ -69,9 +69,9 @@ class ConversationStateMapper extends Mapper {
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->insert('ocsms_conversation_read_states') $qb->insert('ocsms_conversation_read_states')
->values(array( ->values(array(
'user_id' => $userId, 'user_id' => $qb->createNamedParameter($userId),
'phone_number' => $phoneNumber, 'phone_number' => $qb->createNamedParameter($phoneNumber),
'int_date' => $lastDate 'int_date' => $qb->createNamedParameter($lastDate)
)); ));
$this->db->commit(); $this->db->commit();
} }

View File

@ -368,18 +368,20 @@ class SmsMapper extends Mapper {
$qb->execute(); $qb->execute();
} }
$now = date("Y-m-d H:i:s"); $now = date("Y-m-d H:i:s");
$query = \OCP\DB::prepare('INSERT INTO *PREFIX*ocsms_smsdatas ' . $qb->insert('ocsms_smsdatas')
'(user_id, added, lastmodified, sms_flags, sms_date, sms_id,' . ->values(array(
'sms_address, sms_msg, sms_mailbox, sms_type) VALUES ' . 'user_id' => $qb->createNamedParameter($userId),
'(?,?,?,?,?,?,?,?,?,?)'); 'added' => $qb->createNamedParameter($now),
$result = $query->execute(array( 'lastmodified' => $qb->createNamedParameter($now),
$userId, $now, $now, $smsFlags, 'sms_flags' => $qb->createNamedParameter($smsFlags),
$sms["date"], (int) $sms["_id"], 'sms_date' => $qb->createNamedParameter($sms["date"]),
$sms["address"], $sms["body"], (int) $sms["mbox"], 'sms_id' => $qb->createNamedParameter((int) $sms["_id"]),
(int) $sms["type"] 'sms_address' => $qb->createNamedParameter($sms["address"]),
)); 'sms_msg' => $qb->createNamedParameter($sms["body"]),
'sms_mailbox' => $qb->createNamedParameter((int) $sms["mbox"]),
'sms_type' => $qb->createNamedParameter((int) $sms["type"])
));
$qb->execute();
} }
$this->db->commit(); $this->db->commit();