From 25eb2114408fbb22a473cf85a15b447f0b5ef825 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 10 Apr 2018 08:32:16 +0200 Subject: [PATCH] Migrate one function to the new querybuilder for NC 14 --- db/configmapper.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/db/configmapper.php b/db/configmapper.php index 4d2e275..640faa6 100644 --- a/db/configmapper.php +++ b/db/configmapper.php @@ -11,6 +11,7 @@ namespace OCA\OcSms\Db; +use OCP\AppFramework\Db\MultipleObjectsReturnedException; use \OCP\IDBConnection; use \OCP\AppFramework\Db\Mapper; @@ -57,19 +58,31 @@ class ConfigMapper extends Mapper { return true; } catch (DoesNotExistException $e){ return false; + } catch (MultipleObjectsReturnedException $e) { + return true; } } public function getKey ($key) { try { - $query = \OCP\DB::prepare("SELECT `value` FROM `*PREFIX*ocsms_config` WHERE `key` = ? AND `user` = ?"); - $result = $query->execute(array($key, $this->user)); - while($row = $result->fetchRow()) { + $qb = $this->db->getQueryBuilder(); + $qb->select('value') + ->from('ocsms_config') + ->where( + $qb->expr()->andX( + $qb->expr()->eq('key', $qb->createNamedParameter($key)), + $qb->expr()->eq('user', $qb->createNamedParameter($this->user)) + ) + ); + $result = $qb->execute(); + if ($row = $result->fetch()) { return $this->crypto->decrypt($row["value"]); } return false; } catch (DoesNotExistException $e){ return false; + } catch (\Exception $e) { + return false; } }