diff options
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/carddav/addressbookimpl.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/carddav/carddavbackend.php | 17 | ||||
| -rw-r--r-- | apps/dav/tests/unit/carddav/addressbookimpltest.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/carddav/carddavbackendtest.php | 12 |
4 files changed, 18 insertions, 15 deletions
diff --git a/apps/dav/lib/carddav/addressbookimpl.php b/apps/dav/lib/carddav/addressbookimpl.php index 1d7b55c1a5d..795a30064b7 100644 --- a/apps/dav/lib/carddav/addressbookimpl.php +++ b/apps/dav/lib/carddav/addressbookimpl.php @@ -178,7 +178,7 @@ class AddressBookImpl implements IAddressBook { protected function createUid() { do { $uid = $this->getUid(); - $contact = $this->backend->getContact($uid . '.vcf'); + $contact = $this->backend->getContact($this->getKey(), $uid . '.vcf'); } while (!empty($contact)); return $uid; diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php index aa2490ab11a..78706ae6bff 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/carddav/carddavbackend.php @@ -548,7 +548,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { */ function deleteCard($addressBookId, $cardUri) { try { - $cardId = $this->getCardId($cardUri); + $cardId = $this->getCardId($addressBookId, $cardUri); } catch (\InvalidArgumentException $e) { $cardId = null; } @@ -807,15 +807,16 @@ class CardDavBackend implements BackendInterface, SyncSupport { /** * return contact with the given URI * + * @param int $addressBookId * @param string $uri * @returns array */ - public function getContact($uri) { + public function getContact($addressBookId, $uri) { $result = []; $query = $this->db->getQueryBuilder(); $query->select('*')->from($this->dbCardsTable) - ->where($query->expr()->eq('uri', $query->createParameter('uri'))) - ->setParameter('uri', $uri); + ->where($query->expr()->eq('uri', $query->createNamedParameter($uri))) + ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId))); $queryResult = $query->execute(); $contact = $queryResult->fetch(); $queryResult->closeCursor(); @@ -851,7 +852,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { * @param string $vCardSerialized */ protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) { - $cardId = $this->getCardId($cardUri); + $cardId = $this->getCardId($addressBookId, $cardUri); $vCard = $this->readCard($vCardSerialized); $this->purgeProperties($addressBookId, $cardId); @@ -913,13 +914,15 @@ class CardDavBackend implements BackendInterface, SyncSupport { /** * get ID from a given contact * + * @param int $addressBookId * @param string $uri * @return int */ - protected function getCardId($uri) { + protected function getCardId($addressBookId, $uri) { $query = $this->db->getQueryBuilder(); $query->select('id')->from($this->dbCardsTable) - ->where($query->expr()->eq('uri', $query->createNamedParameter($uri))); + ->where($query->expr()->eq('uri', $query->createNamedParameter($uri))) + ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId))); $result = $query->execute(); $cardIds = $result->fetch(); diff --git a/apps/dav/tests/unit/carddav/addressbookimpltest.php b/apps/dav/tests/unit/carddav/addressbookimpltest.php index ff7b982abd4..f2c739e046d 100644 --- a/apps/dav/tests/unit/carddav/addressbookimpltest.php +++ b/apps/dav/tests/unit/carddav/addressbookimpltest.php @@ -261,7 +261,7 @@ class AddressBookImplTest extends TestCase { // simulate that 'uid0' already exists, so the second uid will be returned $this->backend->expects($this->exactly(2))->method('getContact') ->willReturnCallback( - function($uid) { + function($id, $uid) { return ($uid === 'uid0.vcf'); } ); diff --git a/apps/dav/tests/unit/carddav/carddavbackendtest.php b/apps/dav/tests/unit/carddav/carddavbackendtest.php index f7e59b3fda9..3b5395fb09e 100644 --- a/apps/dav/tests/unit/carddav/carddavbackendtest.php +++ b/apps/dav/tests/unit/carddav/carddavbackendtest.php @@ -44,7 +44,7 @@ class CardDavBackendTest extends TestCase { /** @var CardDavBackend */ private $backend; - /** @var Principal | \PHPUnit_Framework_MockObject_MockObject */ + /** @var Principal | \PHPUnit_Framework_MockObject_MockObject */ private $principal; /** @var IDBConnection */ @@ -268,7 +268,7 @@ class CardDavBackendTest extends TestCase { // create a new address book $this->backend->expects($this->once()) ->method('getCardId') - ->with($uri) + ->with($bookId, $uri) ->willThrowException(new \InvalidArgumentException()); $this->backend->expects($this->exactly(2)) ->method('addChange') @@ -445,14 +445,14 @@ class CardDavBackendTest extends TestCase { $id = $query->getLastInsertId(); $this->assertSame($id, - $this->invokePrivate($this->backend, 'getCardId', ['uri'])); + $this->invokePrivate($this->backend, 'getCardId', [1, 'uri'])); } /** * @expectedException InvalidArgumentException */ public function testGetCardIdFailed() { - $this->invokePrivate($this->backend, 'getCardId', ['uri']); + $this->invokePrivate($this->backend, 'getCardId', [1, 'uri']); } /** @@ -596,7 +596,7 @@ class CardDavBackendTest extends TestCase { $query->execute(); } - $result = $this->backend->getContact('uri0'); + $result = $this->backend->getContact(0, 'uri0'); $this->assertSame(7, count($result)); $this->assertSame(0, (int)$result['addressbookid']); $this->assertSame('uri0', $result['uri']); @@ -606,7 +606,7 @@ class CardDavBackendTest extends TestCase { } public function testGetContactFail() { - $this->assertEmpty($this->backend->getContact('uri')); + $this->assertEmpty($this->backend->getContact(0, 'uri')); } public function testCollectCardProperties() { |