nextcloud / server

apps/dav/lib/RootCollection.php

Indentation +139 added lines, -139 removed lines

@@ -55,143 +55,143 @@
 use Sabre\DAV\SimpleCollection;
 
 class RootCollection extends SimpleCollection {
-	public function __construct() {
-		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->get(LoggerInterface::class);
-		$userManager = \OC::$server->getUserManager();
-		$userSession = \OC::$server->getUserSession();
-		$groupManager = \OC::$server->getGroupManager();
-		$shareManager = \OC::$server->getShareManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->get(IEventDispatcher::class);
-		$config = \OC::$server->get(IConfig::class);
-		$proxyMapper = \OC::$server->query(ProxyMapper::class);
-		$rootFolder = \OCP\Server::get(IRootFolder::class);
-
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			\OC::$server->get(IAccountManager::class),
-			$shareManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
-			$proxyMapper,
-			\OC::$server->get(KnownUserService::class),
-			\OC::$server->getConfig(),
-			\OC::$server->getL10NFactory()
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
-
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
-		$calendarResourcePrincipals->disableListing = $disableListing;
-		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarRoomPrincipals->disableListing = $disableListing;
-
-
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$groupManager,
-			$random,
-			$logger,
-			$dispatcher,
-			$config
-		);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $logger);
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $logger);
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $logger);
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $logger);
-
-		$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getUserSession(),
-			$groupManager
-		);
-		$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
-			$groupManager,
-			\OC::$server->getEventDispatcher()
-		);
-		$systemTagInUseCollection = \OCP\Server::get(SystemTag\SystemTagsInUseCollection::class);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			$userManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			$logger
-		);
-
-		$pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
-
-		$uploadCollection = new Upload\RootCollection(
-			$userPrincipalBackend,
-			'principals/users',
-			\OC::$server->query(CleanupService::class));
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$appleProvisioning = new AppleProvisioningNode(
-			\OC::$server->query(ITimeFactory::class));
-
-		$children = [
-			new SimpleCollection('principals', [
-				$userPrincipals,
-				$groupPrincipals,
-				$systemPrincipals,
-				$calendarResourcePrincipals,
-				$calendarRoomPrincipals]),
-			$filesCollection,
-			$userCalendarRoot,
-			new SimpleCollection('system-calendars', [
-				$resourceCalendarRoot,
-				$roomCalendarRoot,
-			]),
-			$publicCalendarRoot,
-			new SimpleCollection('addressbooks', [
-				$usersAddressBookRoot,
-				$systemAddressBookRoot]),
-			$systemTagCollection,
-			$systemTagRelationsCollection,
-			$systemTagInUseCollection,
-			$commentsCollection,
-			$uploadCollection,
-			$avatarCollection,
-			new SimpleCollection('provisioning', [
-				$appleProvisioning
-			])
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $l10n = \OC::$server->getL10N('dav');
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->get(LoggerInterface::class);
+        $userManager = \OC::$server->getUserManager();
+        $userSession = \OC::$server->getUserSession();
+        $groupManager = \OC::$server->getGroupManager();
+        $shareManager = \OC::$server->getShareManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->get(IEventDispatcher::class);
+        $config = \OC::$server->get(IConfig::class);
+        $proxyMapper = \OC::$server->query(ProxyMapper::class);
+        $rootFolder = \OCP\Server::get(IRootFolder::class);
+
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            \OC::$server->get(IAccountManager::class),
+            $shareManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getAppManager(),
+            $proxyMapper,
+            \OC::$server->get(KnownUserService::class),
+            \OC::$server->getConfig(),
+            \OC::$server->getL10NFactory()
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
+
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
+        $calendarResourcePrincipals->disableListing = $disableListing;
+        $calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
+        $calendarRoomPrincipals->disableListing = $disableListing;
+
+
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $groupManager,
+            $random,
+            $logger,
+            $dispatcher,
+            $config
+        );
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $logger);
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $logger);
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $logger);
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $logger);
+
+        $systemTagCollection = new SystemTag\SystemTagsByIdCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getUserSession(),
+            $groupManager
+        );
+        $systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getSystemTagObjectMapper(),
+            \OC::$server->getUserSession(),
+            $groupManager,
+            \OC::$server->getEventDispatcher()
+        );
+        $systemTagInUseCollection = \OCP\Server::get(SystemTag\SystemTagsInUseCollection::class);
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            $userManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            $logger
+        );
+
+        $pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
+
+        $uploadCollection = new Upload\RootCollection(
+            $userPrincipalBackend,
+            'principals/users',
+            \OC::$server->query(CleanupService::class));
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $appleProvisioning = new AppleProvisioningNode(
+            \OC::$server->query(ITimeFactory::class));
+
+        $children = [
+            new SimpleCollection('principals', [
+                $userPrincipals,
+                $groupPrincipals,
+                $systemPrincipals,
+                $calendarResourcePrincipals,
+                $calendarRoomPrincipals]),
+            $filesCollection,
+            $userCalendarRoot,
+            new SimpleCollection('system-calendars', [
+                $resourceCalendarRoot,
+                $roomCalendarRoot,
+            ]),
+            $publicCalendarRoot,
+            new SimpleCollection('addressbooks', [
+                $usersAddressBookRoot,
+                $systemAddressBookRoot]),
+            $systemTagCollection,
+            $systemTagRelationsCollection,
+            $systemTagInUseCollection,
+            $commentsCollection,
+            $uploadCollection,
+            $avatarCollection,
+            new SimpleCollection('provisioning', [
+                $appleProvisioning
+            ])
+        ];
+
+        parent::__construct('root', $children);
+    }
 }

apps/dav/lib/CardDAV/CardDavBackend.php

Indentation +1347 added lines, -1347 removed lines

@@ -60,1351 +60,1351 @@
 use Sabre\VObject\Reader;
 
 class CardDavBackend implements BackendInterface, SyncSupport {
-	use TTransactional;
-
-	public const PERSONAL_ADDRESSBOOK_URI = 'contacts';
-	public const PERSONAL_ADDRESSBOOK_NAME = 'Contacts';
-
-	private Principal $principalBackend;
-	private string $dbCardsTable = 'cards';
-	private string $dbCardsPropertiesTable = 'cards_properties';
-	private IDBConnection $db;
-	private Backend $sharingBackend;
-
-	/** @var array properties to index */
-	public static array $indexProperties = [
-		'BDAY', 'UID', 'N', 'FN', 'TITLE', 'ROLE', 'NOTE', 'NICKNAME',
-		'ORG', 'CATEGORIES', 'EMAIL', 'TEL', 'IMPP', 'ADR', 'URL', 'GEO',
-		'CLOUD', 'X-SOCIALPROFILE'];
-
-	/**
-	 * @var string[] Map of uid => display name
-	 */
-	protected array $userDisplayNames;
-	private IUserManager $userManager;
-	private IEventDispatcher $dispatcher;
-	private array $etagCache = [];
-
-	/**
-	 * CardDavBackend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param Principal $principalBackend
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IEventDispatcher $dispatcher
-	 */
-	public function __construct(IDBConnection $db,
-								Principal $principalBackend,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								IEventDispatcher $dispatcher) {
-		$this->db = $db;
-		$this->principalBackend = $principalBackend;
-		$this->userManager = $userManager;
-		$this->dispatcher = $dispatcher;
-		$this->sharingBackend = new Backend($this->db, $this->userManager, $groupManager, $principalBackend, 'addressbook');
-	}
-
-	/**
-	 * Return the number of address books for a principal
-	 *
-	 * @param $principalUri
-	 * @return int
-	 */
-	public function getAddressBooksForUserCount($principalUri) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->count('*'))
-			->from('addressbooks')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-		$result = $query->executeQuery();
-		$column = (int) $result->fetchOne();
-		$result->closeCursor();
-		return $column;
-	}
-
-	/**
-	 * Returns the list of address books for a specific user.
-	 *
-	 * Every addressbook should have the following properties:
-	 *   id - an arbitrary unique id
-	 *   uri - the 'basename' part of the url
-	 *   principaluri - Same as the passed parameter
-	 *
-	 * Any additional clark-notation property may be passed besides this. Some
-	 * common ones are :
-	 *   {DAV:}displayname
-	 *   {urn:ietf:params:xml:ns:carddav}addressbook-description
-	 *   {http://calendarserver.org/ns/}getctag
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	public function getAddressBooksForUser($principalUri) {
-		return $this->atomic(function () use ($principalUri) {
-			$principalUriOriginal = $principalUri;
-			$principalUri = $this->convertPrincipal($principalUri, true);
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-				->from('addressbooks')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-			$addressBooks = [];
-
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$addressBooks[$row['id']] = [
-					'id' => $row['id'],
-					'uri' => $row['uri'],
-					'principaluri' => $this->convertPrincipal($row['principaluri'], false),
-					'{DAV:}displayname' => $row['displayname'],
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-				];
-
-				$this->addOwnerPrincipal($addressBooks[$row['id']]);
-			}
-			$result->closeCursor();
-
-			// query for shared addressbooks
-			$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
-			$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
-
-			$principals[] = $principalUri;
-
-			$query = $this->db->getQueryBuilder();
-			$result = $query->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access'])
-				->from('dav_shares', 's')
-				->join('s', 'addressbooks', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-				->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
-				->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
-				->setParameter('type', 'addressbook')
-				->setParameter('principaluri', $principals, IQueryBuilder::PARAM_STR_ARRAY)
-				->execute();
-
-			$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-			while ($row = $result->fetch()) {
-				if ($row['principaluri'] === $principalUri) {
-					continue;
-				}
-
-				$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
-				if (isset($addressBooks[$row['id']])) {
-					if ($readOnly) {
-						// New share can not have more permissions then the old one.
-						continue;
-					}
-					if (isset($addressBooks[$row['id']][$readOnlyPropertyName]) &&
-						$addressBooks[$row['id']][$readOnlyPropertyName] === 0) {
-						// Old share is already read-write, no more permissions can be gained
-						continue;
-					}
-				}
-
-				[, $name] = \Sabre\Uri\split($row['principaluri']);
-				$uri = $row['uri'] . '_shared_by_' . $name;
-				$displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
-
-				$addressBooks[$row['id']] = [
-					'id' => $row['id'],
-					'uri' => $uri,
-					'principaluri' => $principalUriOriginal,
-					'{DAV:}displayname' => $displayName,
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
-					$readOnlyPropertyName => $readOnly,
-				];
-
-				$this->addOwnerPrincipal($addressBooks[$row['id']]);
-			}
-			$result->closeCursor();
-
-			return array_values($addressBooks);
-		}, $this->db);
-	}
-
-	public function getUsersOwnAddressBooks($principalUri) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-			->from('addressbooks')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-		$addressBooks = [];
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$addressBooks[$row['id']] = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], false),
-				'{DAV:}displayname' => $row['displayname'],
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-				'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-			];
-
-			$this->addOwnerPrincipal($addressBooks[$row['id']]);
-		}
-		$result->closeCursor();
-
-		return array_values($addressBooks);
-	}
-
-	/**
-	 * @param int $addressBookId
-	 */
-	public function getAddressBookById(int $addressBookId): ?array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-			->from('addressbooks')
-			->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
-			->executeQuery();
-		$row = $result->fetch();
-		$result->closeCursor();
-		if (!$row) {
-			return null;
-		}
-
-		$addressBook = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $row['principaluri'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-		];
-
-		$this->addOwnerPrincipal($addressBook);
-
-		return $addressBook;
-	}
-
-	public function getAddressBooksByUri(string $principal, string $addressBookUri): ?array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-			->from('addressbooks')
-			->where($query->expr()->eq('uri', $query->createNamedParameter($addressBookUri)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
-			->setMaxResults(1)
-			->executeQuery();
-
-		$row = $result->fetch();
-		$result->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$addressBook = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $row['principaluri'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-		];
-
-		// system address books are always read only
-		if ($principal === 'principals/system/system') {
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
-		}
-
-		$this->addOwnerPrincipal($addressBook);
-
-		return $addressBook;
-	}
-
-	/**
-	 * Updates properties for an address book.
-	 *
-	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-	 * To do the actual updates, you must tell this object which properties
-	 * you're going to process with the handle() method.
-	 *
-	 * Calling the handle method is like telling the PropPatch object "I
-	 * promise I can handle updating this property".
-	 *
-	 * Read the PropPatch documentation for more info and examples.
-	 *
-	 * @param string $addressBookId
-	 * @param \Sabre\DAV\PropPatch $propPatch
-	 * @return void
-	 */
-	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
-		$this->atomic(function () use ($addressBookId, $propPatch) {
-			$supportedProperties = [
-				'{DAV:}displayname',
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description',
-			];
-
-			$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
-				$updates = [];
-				foreach ($mutations as $property => $newValue) {
-					switch ($property) {
-						case '{DAV:}displayname':
-							$updates['displayname'] = $newValue;
-							break;
-						case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
-							$updates['description'] = $newValue;
-							break;
-					}
-				}
-				$query = $this->db->getQueryBuilder();
-				$query->update('addressbooks');
-
-				foreach ($updates as $key => $value) {
-					$query->set($key, $query->createNamedParameter($value));
-				}
-				$query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
-					->executeStatement();
-
-				$this->addChange($addressBookId, "", 2);
-
-				$addressBookRow = $this->getAddressBookById((int)$addressBookId);
-				$shares = $this->getShares((int)$addressBookId);
-				$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
-
-				return true;
-			});
-		}, $this->db);
-	}
-
-	/**
-	 * Creates a new address book
-	 *
-	 * @param string $principalUri
-	 * @param string $url Just the 'basename' of the url.
-	 * @param array $properties
-	 * @return int
-	 * @throws BadRequest
-	 */
-	public function createAddressBook($principalUri, $url, array $properties) {
-		if (strlen($url) > 255) {
-			throw new BadRequest('URI too long. Address book not created');
-		}
-
-		$values = [
-			'displayname' => null,
-			'description' => null,
-			'principaluri' => $principalUri,
-			'uri' => $url,
-			'synctoken' => 1
-		];
-
-		foreach ($properties as $property => $newValue) {
-			switch ($property) {
-				case '{DAV:}displayname':
-					$values['displayname'] = $newValue;
-					break;
-				case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
-					$values['description'] = $newValue;
-					break;
-				default:
-					throw new BadRequest('Unknown property: ' . $property);
-			}
-		}
-
-		// Fallback to make sure the displayname is set. Some clients may refuse
-		// to work with addressbooks not having a displayname.
-		if (is_null($values['displayname'])) {
-			$values['displayname'] = $url;
-		}
-
-		[$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
-			$query = $this->db->getQueryBuilder();
-			$query->insert('addressbooks')
-				->values([
-					'uri' => $query->createParameter('uri'),
-					'displayname' => $query->createParameter('displayname'),
-					'description' => $query->createParameter('description'),
-					'principaluri' => $query->createParameter('principaluri'),
-					'synctoken' => $query->createParameter('synctoken'),
-				])
-				->setParameters($values)
-				->execute();
-
-			$addressBookId = $query->getLastInsertId();
-			return [
-				$addressBookId,
-				$this->getAddressBookById($addressBookId),
-			];
-		}, $this->db);
-
-		$this->dispatcher->dispatchTyped(new AddressBookCreatedEvent($addressBookId, $addressBookRow));
-
-		return $addressBookId;
-	}
-
-	/**
-	 * Deletes an entire addressbook and all its contents
-	 *
-	 * @param mixed $addressBookId
-	 * @return void
-	 */
-	public function deleteAddressBook($addressBookId) {
-		$this->atomic(function () use ($addressBookId) {
-			$addressBookId = (int)$addressBookId;
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete($this->dbCardsTable)
-				->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
-				->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
-				->executeStatement();
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete('addressbookchanges')
-				->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
-				->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
-				->executeStatement();
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete('addressbooks')
-				->where($query->expr()->eq('id', $query->createParameter('id')))
-				->setParameter('id', $addressBookId, IQueryBuilder::PARAM_INT)
-				->executeStatement();
-
-			$this->sharingBackend->deleteAllShares($addressBookId);
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete($this->dbCardsPropertiesTable)
-				->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
-				->executeStatement();
-
-			if ($addressBookData) {
-				$this->dispatcher->dispatchTyped(new AddressBookDeletedEvent($addressBookId, $addressBookData, $shares));
-			}
-		}, $this->db);
-	}
-
-	/**
-	 * Returns all cards for a specific addressbook id.
-	 *
-	 * This method should return the following properties for each card:
-	 *   * carddata - raw vcard data
-	 *   * uri - Some unique url
-	 *   * lastmodified - A unix timestamp
-	 *
-	 * It's recommended to also return the following properties:
-	 *   * etag - A unique etag. This must change every time the card changes.
-	 *   * size - The size of the card in bytes.
-	 *
-	 * If these last two properties are provided, less time will be spent
-	 * calculating them. If they are specified, you can also omit carddata.
-	 * This may speed up certain requests, especially with large cards.
-	 *
-	 * @param mixed $addressbookId
-	 * @return array
-	 */
-	public function getCards($addressbookId) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressbookId)));
-
-		$cards = [];
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$row['etag'] = '"' . $row['etag'] . '"';
-
-			$modified = false;
-			$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-			if ($modified) {
-				$row['size'] = strlen($row['carddata']);
-			}
-
-			$cards[] = $row;
-		}
-		$result->closeCursor();
-
-		return $cards;
-	}
-
-	/**
-	 * Returns a specific card.
-	 *
-	 * The same set of properties must be returned as with getCards. The only
-	 * exception is that 'carddata' is absolutely required.
-	 *
-	 * If the card does not exist, you must return false.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @return array
-	 */
-	public function getCard($addressBookId, $cardUri) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
-			->setMaxResults(1);
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		if (!$row) {
-			return false;
-		}
-		$row['etag'] = '"' . $row['etag'] . '"';
-
-		$modified = false;
-		$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-		if ($modified) {
-			$row['size'] = strlen($row['carddata']);
-		}
-
-		return $row;
-	}
-
-	/**
-	 * Returns a list of cards.
-	 *
-	 * This method should work identical to getCard, but instead return all the
-	 * cards in the list as an array.
-	 *
-	 * If the backend supports this, it may allow for some speed-ups.
-	 *
-	 * @param mixed $addressBookId
-	 * @param array $uris
-	 * @return array
-	 */
-	public function getMultipleCards($addressBookId, array $uris) {
-		if (empty($uris)) {
-			return [];
-		}
-
-		$chunks = array_chunk($uris, 100);
-		$cards = [];
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-			->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
-
-		foreach ($chunks as $uris) {
-			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->execute();
-
-			while ($row = $result->fetch()) {
-				$row['etag'] = '"' . $row['etag'] . '"';
-
-				$modified = false;
-				$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-				if ($modified) {
-					$row['size'] = strlen($row['carddata']);
-				}
-
-				$cards[] = $row;
-			}
-			$result->closeCursor();
-		}
-		return $cards;
-	}
-
-	/**
-	 * Creates a new card.
-	 *
-	 * The addressbook id will be passed as the first argument. This is the
-	 * same id as it is returned from the getAddressBooksForUser method.
-	 *
-	 * The cardUri is a base uri, and doesn't include the full path. The
-	 * cardData argument is the vcard body, and is passed as a string.
-	 *
-	 * It is possible to return an ETag from this method. This ETag is for the
-	 * newly created resource, and must be enclosed with double quotes (that
-	 * is, the string itself must contain the double quotes).
-	 *
-	 * You should only return the ETag if you store the carddata as-is. If a
-	 * subsequent GET request on the same card does not have the same body,
-	 * byte-by-byte and you did return an ETag here, clients tend to get
-	 * confused.
-	 *
-	 * If you don't return an ETag, you can just return null.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 * @param bool $checkAlreadyExists
-	 * @return string
-	 */
-	public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
-		$etag = md5($cardData);
-		$uid = $this->getUID($cardData);
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
-			if ($checkAlreadyExists) {
-				$q = $this->db->getQueryBuilder();
-				$q->select('uid')
-					->from($this->dbCardsTable)
-					->where($q->expr()->eq('addressbookid', $q->createNamedParameter($addressBookId)))
-					->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
-					->setMaxResults(1);
-				$result = $q->executeQuery();
-				$count = (bool)$result->fetchOne();
-				$result->closeCursor();
-				if ($count) {
-					throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
-				}
-			}
-
-			$query = $this->db->getQueryBuilder();
-			$query->insert('cards')
-				->values([
-					'carddata' => $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB),
-					'uri' => $query->createNamedParameter($cardUri),
-					'lastmodified' => $query->createNamedParameter(time()),
-					'addressbookid' => $query->createNamedParameter($addressBookId),
-					'size' => $query->createNamedParameter(strlen($cardData)),
-					'etag' => $query->createNamedParameter($etag),
-					'uid' => $query->createNamedParameter($uid),
-				])
-				->execute();
-
-			$etagCacheKey = "$addressBookId#$cardUri";
-			$this->etagCache[$etagCacheKey] = $etag;
-
-			$this->addChange($addressBookId, $cardUri, 1);
-			$this->updateProperties($addressBookId, $cardUri, $cardData);
-
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-			$objectRow = $this->getCard($addressBookId, $cardUri);
-			$this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-
-			return '"' . $etag . '"';
-		}, $this->db);
-	}
-
-	/**
-	 * Updates a card.
-	 *
-	 * The addressbook id will be passed as the first argument. This is the
-	 * same id as it is returned from the getAddressBooksForUser method.
-	 *
-	 * The cardUri is a base uri, and doesn't include the full path. The
-	 * cardData argument is the vcard body, and is passed as a string.
-	 *
-	 * It is possible to return an ETag from this method. This ETag should
-	 * match that of the updated resource, and must be enclosed with double
-	 * quotes (that is: the string itself must contain the actual quotes).
-	 *
-	 * You should only return the ETag if you store the carddata as-is. If a
-	 * subsequent GET request on the same card does not have the same body,
-	 * byte-by-byte and you did return an ETag here, clients tend to get
-	 * confused.
-	 *
-	 * If you don't return an ETag, you can just return null.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 * @return string
-	 */
-	public function updateCard($addressBookId, $cardUri, $cardData) {
-		$uid = $this->getUID($cardData);
-		$etag = md5($cardData);
-
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
-			$query = $this->db->getQueryBuilder();
-
-			// check for recently stored etag and stop if it is the same
-			$etagCacheKey = "$addressBookId#$cardUri";
-			if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
-				return '"' . $etag . '"';
-			}
-
-			$query->update($this->dbCardsTable)
-				->set('carddata', $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB))
-				->set('lastmodified', $query->createNamedParameter(time()))
-				->set('size', $query->createNamedParameter(strlen($cardData)))
-				->set('etag', $query->createNamedParameter($etag))
-				->set('uid', $query->createNamedParameter($uid))
-				->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
-				->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-				->execute();
-
-			$this->etagCache[$etagCacheKey] = $etag;
-
-			$this->addChange($addressBookId, $cardUri, 2);
-			$this->updateProperties($addressBookId, $cardUri, $cardData);
-
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-			$objectRow = $this->getCard($addressBookId, $cardUri);
-			$this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-			return '"' . $etag . '"';
-		}, $this->db);
-	}
-
-	/**
-	 * Deletes a card
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @return bool
-	 */
-	public function deleteCard($addressBookId, $cardUri) {
-		return $this->atomic(function () use ($addressBookId, $cardUri) {
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-			$objectRow = $this->getCard($addressBookId, $cardUri);
-
-			try {
-				$cardId = $this->getCardId($addressBookId, $cardUri);
-			} catch (\InvalidArgumentException $e) {
-				$cardId = null;
-			}
-			$query = $this->db->getQueryBuilder();
-			$ret = $query->delete($this->dbCardsTable)
-				->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
-				->executeStatement();
-
-			$this->addChange($addressBookId, $cardUri, 3);
-
-			if ($ret === 1) {
-				if ($cardId !== null) {
-					$this->dispatcher->dispatchTyped(new CardDeletedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-					$this->purgeProperties($addressBookId, $cardId);
-				}
-				return true;
-			}
-
-			return false;
-		}, $this->db);
-	}
-
-	/**
-	 * The getChanges method returns all the changes that have happened, since
-	 * the specified syncToken in the specified address book.
-	 *
-	 * This function should return an array, such as the following:
-	 *
-	 * [
-	 *   'syncToken' => 'The current synctoken',
-	 *   'added'   => [
-	 *      'new.txt',
-	 *   ],
-	 *   'modified'   => [
-	 *      'modified.txt',
-	 *   ],
-	 *   'deleted' => [
-	 *      'foo.php.bak',
-	 *      'old.txt'
-	 *   ]
-	 * ];
-	 *
-	 * The returned syncToken property should reflect the *current* syncToken
-	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-	 * property. This is needed here too, to ensure the operation is atomic.
-	 *
-	 * If the $syncToken argument is specified as null, this is an initial
-	 * sync, and all members should be reported.
-	 *
-	 * The modified property is an array of nodenames that have changed since
-	 * the last token.
-	 *
-	 * The deleted property is an array with nodenames, that have been deleted
-	 * from collection.
-	 *
-	 * The $syncLevel argument is basically the 'depth' of the report. If it's
-	 * 1, you only have to report changes that happened only directly in
-	 * immediate descendants. If it's 2, it should also include changes from
-	 * the nodes below the child collections. (grandchildren)
-	 *
-	 * The $limit argument allows a client to specify how many results should
-	 * be returned at most. If the limit is not specified, it should be treated
-	 * as infinite.
-	 *
-	 * If the limit (infinite or not) is higher than you're willing to return,
-	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-	 *
-	 * If the syncToken is expired (due to data cleanup) or unknown, you must
-	 * return null.
-	 *
-	 * The limit is 'suggestive'. You are free to ignore it.
-	 *
-	 * @param string $addressBookId
-	 * @param string $syncToken
-	 * @param int $syncLevel
-	 * @param int|null $limit
-	 * @return array
-	 */
-	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
-		// Current synctoken
-		return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
-			$qb = $this->db->getQueryBuilder();
-			$qb->select('synctoken')
-				->from('addressbooks')
-				->where(
-					$qb->expr()->eq('id', $qb->createNamedParameter($addressBookId))
-				);
-			$stmt = $qb->executeQuery();
-			$currentToken = $stmt->fetchOne();
-			$stmt->closeCursor();
-
-			if (is_null($currentToken)) {
-				return [];
-			}
-
-			$result = [
-				'syncToken' => $currentToken,
-				'added' => [],
-				'modified' => [],
-				'deleted' => [],
-			];
-
-			if ($syncToken) {
-				$qb = $this->db->getQueryBuilder();
-				$qb->select('uri', 'operation')
-					->from('addressbookchanges')
-					->where(
-						$qb->expr()->andX(
-							$qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
-							$qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
-							$qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
-						)
-					)->orderBy('synctoken');
-
-				if (is_int($limit) && $limit > 0) {
-					$qb->setMaxResults($limit);
-				}
-
-				// Fetching all changes
-				$stmt = $qb->executeQuery();
-
-				$changes = [];
-
-				// This loop ensures that any duplicates are overwritten, only the
-				// last change on a node is relevant.
-				while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-					$changes[$row['uri']] = $row['operation'];
-				}
-				$stmt->closeCursor();
-
-				foreach ($changes as $uri => $operation) {
-					switch ($operation) {
-						case 1:
-							$result['added'][] = $uri;
-							break;
-						case 2:
-							$result['modified'][] = $uri;
-							break;
-						case 3:
-							$result['deleted'][] = $uri;
-							break;
-					}
-				}
-			} else {
-				$qb = $this->db->getQueryBuilder();
-				$qb->select('uri')
-					->from('cards')
-					->where(
-						$qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
-					);
-				// No synctoken supplied, this is the initial sync.
-				$stmt = $qb->executeQuery();
-				$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-				$stmt->closeCursor();
-			}
-			return $result;
-		}, $this->db);
-	}
-
-	/**
-	 * Adds a change record to the addressbookchanges table.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $objectUri
-	 * @param int $operation 1 = add, 2 = modify, 3 = delete
-	 * @return void
-	 */
-	protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
-		$this->atomic(function () use ($addressBookId, $objectUri, $operation) {
-			$query = $this->db->getQueryBuilder();
-			$query->select('synctoken')
-				->from('addressbooks')
-				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
-			$result = $query->executeQuery();
-			$syncToken = (int)$result->fetchOne();
-			$result->closeCursor();
-
-			$query = $this->db->getQueryBuilder();
-			$query->insert('addressbookchanges')
-				->values([
-					'uri' => $query->createNamedParameter($objectUri),
-					'synctoken' => $query->createNamedParameter($syncToken),
-					'addressbookid' => $query->createNamedParameter($addressBookId),
-					'operation' => $query->createNamedParameter($operation),
-				])
-				->executeStatement();
-
-			$query = $this->db->getQueryBuilder();
-			$query->update('addressbooks')
-				->set('synctoken', $query->createNamedParameter($syncToken + 1, IQueryBuilder::PARAM_INT))
-				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
-				->executeStatement();
-		}, $this->db);
-	}
-
-	/**
-	 * @param resource|string $cardData
-	 * @param bool $modified
-	 * @return string
-	 */
-	private function readBlob($cardData, &$modified = false) {
-		if (is_resource($cardData)) {
-			$cardData = stream_get_contents($cardData);
-		}
-
-		// Micro optimisation
-		// don't loop through
-		if (strpos($cardData, 'PHOTO:data:') === 0) {
-			return $cardData;
-		}
-
-		$cardDataArray = explode("\r\n", $cardData);
-
-		$cardDataFiltered = [];
-		$removingPhoto = false;
-		foreach ($cardDataArray as $line) {
-			if (strpos($line, 'PHOTO:data:') === 0
-				&& strpos($line, 'PHOTO:data:image/') !== 0) {
-				// Filter out PHOTO data of non-images
-				$removingPhoto = true;
-				$modified = true;
-				continue;
-			}
-
-			if ($removingPhoto) {
-				if (strpos($line, ' ') === 0) {
-					continue;
-				}
-				// No leading space means this is a new property
-				$removingPhoto = false;
-			}
-
-			$cardDataFiltered[] = $line;
-		}
-		return implode("\r\n", $cardDataFiltered);
-	}
-
-	/**
-	 * @param list<array{href: string, commonName: string, readOnly: bool}> $add
-	 * @param list<string> $remove
-	 */
-	public function updateShares(IShareable $shareable, array $add, array $remove): void {
-		$this->atomic(function () use ($shareable, $add, $remove) {
-			$addressBookId = $shareable->getResourceId();
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$oldShares = $this->getShares($addressBookId);
-
-			$this->sharingBackend->updateShares($shareable, $add, $remove);
-
-			$this->dispatcher->dispatchTyped(new AddressBookShareUpdatedEvent($addressBookId, $addressBookData, $oldShares, $add, $remove));
-		}, $this->db);
-	}
-
-	/**
-	 * Search contacts in a specific address-book
-	 *
-	 * @param int $addressBookId
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options = array() to define the search behavior
-	 * 	  - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
-	 *    - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
-	 *    - 'limit' - Set a numeric limit for the search results
-	 *    - 'offset' - Set the offset for the limited search results
-	 *    - 'wildcard' - Whether the search should use wildcards
-	 * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
-	 * @return array an array of contacts which are arrays of key-value-pairs
-	 */
-	public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
-		return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
-			return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
-		}, $this->db);
-	}
-
-	/**
-	 * Search contacts in all address-books accessible by a user
-	 *
-	 * @param string $principalUri
-	 * @param string $pattern
-	 * @param array $searchProperties
-	 * @param array $options
-	 * @return array
-	 */
-	public function searchPrincipalUri(string $principalUri,
-									   string $pattern,
-									   array $searchProperties,
-									   array $options = []): array {
-		return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
-			$addressBookIds = array_map(static function ($row):int {
-				return (int) $row['id'];
-			}, $this->getAddressBooksForUser($principalUri));
-
-			return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
-		}, $this->db);
-	}
-
-	/**
-	 * @param array $addressBookIds
-	 * @param string $pattern
-	 * @param array $searchProperties
-	 * @param array $options
-	 * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
-	 * @return array
-	 */
-	private function searchByAddressBookIds(array $addressBookIds,
-											string $pattern,
-											array $searchProperties,
-											array $options = []): array {
-		$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
-		$useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
-
-		$query2 = $this->db->getQueryBuilder();
-
-		$addressBookOr = $query2->expr()->orX();
-		foreach ($addressBookIds as $addressBookId) {
-			$addressBookOr->add($query2->expr()->eq('cp.addressbookid', $query2->createNamedParameter($addressBookId)));
-		}
-
-		if ($addressBookOr->count() === 0) {
-			return [];
-		}
-
-		$propertyOr = $query2->expr()->orX();
-		foreach ($searchProperties as $property) {
-			if ($escapePattern) {
-				if ($property === 'EMAIL' && strpos($pattern, ' ') !== false) {
-					// There can be no spaces in emails
-					continue;
-				}
-
-				if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) {
-					// There can be no chars in cloud ids which are not valid for user ids plus :/
-					// worst case: CA61590A-BBBC-423E-84AF-E6DF01455A53@https://my.nxt/srv/
-					continue;
-				}
-			}
-
-			$propertyOr->add($query2->expr()->eq('cp.name', $query2->createNamedParameter($property)));
-		}
-
-		if ($propertyOr->count() === 0) {
-			return [];
-		}
-
-		$query2->selectDistinct('cp.cardid')
-			->from($this->dbCardsPropertiesTable, 'cp')
-			->andWhere($addressBookOr)
-			->andWhere($propertyOr);
-
-		// No need for like when the pattern is empty
-		if ('' !== $pattern) {
-			if (!$useWildcards) {
-				$query2->andWhere($query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
-			} elseif (!$escapePattern) {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
-			} else {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
-			}
-		}
-
-		if (isset($options['limit'])) {
-			$query2->setMaxResults($options['limit']);
-		}
-		if (isset($options['offset'])) {
-			$query2->setFirstResult($options['offset']);
-		}
-
-		$result = $query2->execute();
-		$matches = $result->fetchAll();
-		$result->closeCursor();
-		$matches = array_map(function ($match) {
-			return (int)$match['cardid'];
-		}, $matches);
-
-		$cards = [];
-		$query = $this->db->getQueryBuilder();
-		$query->select('c.addressbookid', 'c.carddata', 'c.uri')
-			->from($this->dbCardsTable, 'c')
-			->where($query->expr()->in('c.id', $query->createParameter('matches')));
-
-		foreach (array_chunk($matches, 1000) as $matchesChunk) {
-			$query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY);
-			$result = $query->executeQuery();
-			$cards = array_merge($cards, $result->fetchAll());
-			$result->closeCursor();
-		}
-
-		return array_map(function ($array) {
-			$array['addressbookid'] = (int) $array['addressbookid'];
-			$modified = false;
-			$array['carddata'] = $this->readBlob($array['carddata'], $modified);
-			if ($modified) {
-				$array['size'] = strlen($array['carddata']);
-			}
-			return $array;
-		}, $cards);
-	}
-
-	/**
-	 * @param int $bookId
-	 * @param string $name
-	 * @return array
-	 */
-	public function collectCardProperties($bookId, $name) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->selectDistinct('value')
-			->from($this->dbCardsPropertiesTable)
-			->where($query->expr()->eq('name', $query->createNamedParameter($name)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
-			->execute();
-
-		$all = $result->fetchAll(PDO::FETCH_COLUMN);
-		$result->closeCursor();
-
-		return $all;
-	}
-
-	/**
-	 * get URI from a given contact
-	 *
-	 * @param int $id
-	 * @return string
-	 */
-	public function getCardUri($id) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('uri')->from($this->dbCardsTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-
-		$result = $query->execute();
-		$uri = $result->fetch();
-		$result->closeCursor();
-
-		if (!isset($uri['uri'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $id);
-		}
-
-		return $uri['uri'];
-	}
-
-	/**
-	 * return contact with the given URI
-	 *
-	 * @param int $addressBookId
-	 * @param string $uri
-	 * @returns array
-	 */
-	public function getContact($addressBookId, $uri) {
-		$result = [];
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')->from($this->dbCardsTable)
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-		$queryResult = $query->execute();
-		$contact = $queryResult->fetch();
-		$queryResult->closeCursor();
-
-		if (is_array($contact)) {
-			$modified = false;
-			$contact['etag'] = '"' . $contact['etag'] . '"';
-			$contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
-			if ($modified) {
-				$contact['size'] = strlen($contact['carddata']);
-			}
-
-			$result = $contact;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Returns the list of people whom this address book is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *
-	 * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
-	 */
-	public function getShares(int $addressBookId): array {
-		return $this->sharingBackend->getShares($addressBookId);
-	}
-
-	/**
-	 * update properties table
-	 *
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $vCardSerialized
-	 */
-	protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
-		$this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized) {
-			$cardId = $this->getCardId($addressBookId, $cardUri);
-			$vCard = $this->readCard($vCardSerialized);
-
-			$this->purgeProperties($addressBookId, $cardId);
-
-			$query = $this->db->getQueryBuilder();
-			$query->insert($this->dbCardsPropertiesTable)
-				->values(
-					[
-						'addressbookid' => $query->createNamedParameter($addressBookId),
-						'cardid' => $query->createNamedParameter($cardId),
-						'name' => $query->createParameter('name'),
-						'value' => $query->createParameter('value'),
-						'preferred' => $query->createParameter('preferred')
-					]
-				);
-
-			foreach ($vCard->children() as $property) {
-				if (!in_array($property->name, self::$indexProperties)) {
-					continue;
-				}
-				$preferred = 0;
-				foreach ($property->parameters as $parameter) {
-					if ($parameter->name === 'TYPE' && strtoupper($parameter->getValue()) === 'PREF') {
-						$preferred = 1;
-						break;
-					}
-				}
-				$query->setParameter('name', $property->name);
-				$query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
-				$query->setParameter('preferred', $preferred);
-				$query->execute();
-			}
-		}, $this->db);
-	}
-
-	/**
-	 * read vCard data into a vCard object
-	 *
-	 * @param string $cardData
-	 * @return VCard
-	 */
-	protected function readCard($cardData) {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * delete all properties from a given card
-	 *
-	 * @param int $addressBookId
-	 * @param int $cardId
-	 */
-	protected function purgeProperties($addressBookId, $cardId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbCardsPropertiesTable)
-			->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-		$query->execute();
-	}
-
-	/**
-	 * Get ID from a given contact
-	 */
-	protected function getCardId(int $addressBookId, string $uri): int {
-		$query = $this->db->getQueryBuilder();
-		$query->select('id')->from($this->dbCardsTable)
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-
-		$result = $query->execute();
-		$cardIds = $result->fetch();
-		$result->closeCursor();
-
-		if (!isset($cardIds['id'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $uri);
-		}
-
-		return (int)$cardIds['id'];
-	}
-
-	/**
-	 * For shared address books the sharee is set in the ACL of the address book
-	 *
-	 * @param int $addressBookId
-	 * @param list<array{privilege: string, principal: string, protected: bool}> $acl
-	 * @return list<array{privilege: string, principal: string, protected: bool}>
-	 */
-	public function applyShareAcl(int $addressBookId, array $acl): array {
-		return $this->sharingBackend->applyShareAcl($addressBookId, $acl);
-	}
-
-	/**
-	 * @throws \InvalidArgumentException
-	 */
-	public function pruneOutdatedSyncTokens(int $keep = 10_000): int {
-		if ($keep < 0) {
-			throw new \InvalidArgumentException();
-		}
-		$query = $this->db->getQueryBuilder();
-		$query->delete('addressbookchanges')
-			->orderBy('id', 'DESC')
-			->setFirstResult($keep);
-		return $query->executeStatement();
-	}
-
-	private function convertPrincipal(string $principalUri, bool $toV2): string {
-		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			[, $name] = \Sabre\Uri\split($principalUri);
-			if ($toV2 === true) {
-				return "principals/users/$name";
-			}
-			return "principals/$name";
-		}
-		return $principalUri;
-	}
-
-	private function addOwnerPrincipal(array &$addressbookInfo): void {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
-		if (isset($addressbookInfo[$ownerPrincipalKey])) {
-			$uri = $addressbookInfo[$ownerPrincipalKey];
-		} else {
-			$uri = $addressbookInfo['principaluri'];
-		}
-
-		$principalInformation = $this->principalBackend->getPrincipalByPath($uri);
-		if (isset($principalInformation['{DAV:}displayname'])) {
-			$addressbookInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
-		}
-	}
-
-	/**
-	 * Extract UID from vcard
-	 *
-	 * @param string $cardData the vcard raw data
-	 * @return string the uid
-	 * @throws BadRequest if no UID is available or vcard is empty
-	 */
-	private function getUID(string $cardData): string {
-		if ($cardData !== '') {
-			$vCard = Reader::read($cardData);
-			if ($vCard->UID) {
-				$uid = $vCard->UID->getValue();
-				return $uid;
-			}
-			// should already be handled, but just in case
-			throw new BadRequest('vCards on CardDAV servers MUST have a UID property');
-		}
-		// should already be handled, but just in case
-		throw new BadRequest('vCard can not be empty');
-	}
+    use TTransactional;
+
+    public const PERSONAL_ADDRESSBOOK_URI = 'contacts';
+    public const PERSONAL_ADDRESSBOOK_NAME = 'Contacts';
+
+    private Principal $principalBackend;
+    private string $dbCardsTable = 'cards';
+    private string $dbCardsPropertiesTable = 'cards_properties';
+    private IDBConnection $db;
+    private Backend $sharingBackend;
+
+    /** @var array properties to index */
+    public static array $indexProperties = [
+        'BDAY', 'UID', 'N', 'FN', 'TITLE', 'ROLE', 'NOTE', 'NICKNAME',
+        'ORG', 'CATEGORIES', 'EMAIL', 'TEL', 'IMPP', 'ADR', 'URL', 'GEO',
+        'CLOUD', 'X-SOCIALPROFILE'];
+
+    /**
+     * @var string[] Map of uid => display name
+     */
+    protected array $userDisplayNames;
+    private IUserManager $userManager;
+    private IEventDispatcher $dispatcher;
+    private array $etagCache = [];
+
+    /**
+     * CardDavBackend constructor.
+     *
+     * @param IDBConnection $db
+     * @param Principal $principalBackend
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IEventDispatcher $dispatcher
+     */
+    public function __construct(IDBConnection $db,
+                                Principal $principalBackend,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IEventDispatcher $dispatcher) {
+        $this->db = $db;
+        $this->principalBackend = $principalBackend;
+        $this->userManager = $userManager;
+        $this->dispatcher = $dispatcher;
+        $this->sharingBackend = new Backend($this->db, $this->userManager, $groupManager, $principalBackend, 'addressbook');
+    }
+
+    /**
+     * Return the number of address books for a principal
+     *
+     * @param $principalUri
+     * @return int
+     */
+    public function getAddressBooksForUserCount($principalUri) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->count('*'))
+            ->from('addressbooks')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+        $result = $query->executeQuery();
+        $column = (int) $result->fetchOne();
+        $result->closeCursor();
+        return $column;
+    }
+
+    /**
+     * Returns the list of address books for a specific user.
+     *
+     * Every addressbook should have the following properties:
+     *   id - an arbitrary unique id
+     *   uri - the 'basename' part of the url
+     *   principaluri - Same as the passed parameter
+     *
+     * Any additional clark-notation property may be passed besides this. Some
+     * common ones are :
+     *   {DAV:}displayname
+     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
+     *   {http://calendarserver.org/ns/}getctag
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getAddressBooksForUser($principalUri) {
+        return $this->atomic(function () use ($principalUri) {
+            $principalUriOriginal = $principalUri;
+            $principalUri = $this->convertPrincipal($principalUri, true);
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+                ->from('addressbooks')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+            $addressBooks = [];
+
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $addressBooks[$row['id']] = [
+                    'id' => $row['id'],
+                    'uri' => $row['uri'],
+                    'principaluri' => $this->convertPrincipal($row['principaluri'], false),
+                    '{DAV:}displayname' => $row['displayname'],
+                    '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                    '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+                    '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+                ];
+
+                $this->addOwnerPrincipal($addressBooks[$row['id']]);
+            }
+            $result->closeCursor();
+
+            // query for shared addressbooks
+            $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+            $principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
+
+            $principals[] = $principalUri;
+
+            $query = $this->db->getQueryBuilder();
+            $result = $query->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access'])
+                ->from('dav_shares', 's')
+                ->join('s', 'addressbooks', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+                ->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
+                ->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
+                ->setParameter('type', 'addressbook')
+                ->setParameter('principaluri', $principals, IQueryBuilder::PARAM_STR_ARRAY)
+                ->execute();
+
+            $readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+            while ($row = $result->fetch()) {
+                if ($row['principaluri'] === $principalUri) {
+                    continue;
+                }
+
+                $readOnly = (int)$row['access'] === Backend::ACCESS_READ;
+                if (isset($addressBooks[$row['id']])) {
+                    if ($readOnly) {
+                        // New share can not have more permissions then the old one.
+                        continue;
+                    }
+                    if (isset($addressBooks[$row['id']][$readOnlyPropertyName]) &&
+                        $addressBooks[$row['id']][$readOnlyPropertyName] === 0) {
+                        // Old share is already read-write, no more permissions can be gained
+                        continue;
+                    }
+                }
+
+                [, $name] = \Sabre\Uri\split($row['principaluri']);
+                $uri = $row['uri'] . '_shared_by_' . $name;
+                $displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
+
+                $addressBooks[$row['id']] = [
+                    'id' => $row['id'],
+                    'uri' => $uri,
+                    'principaluri' => $principalUriOriginal,
+                    '{DAV:}displayname' => $displayName,
+                    '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                    '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+                    '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+                    '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
+                    $readOnlyPropertyName => $readOnly,
+                ];
+
+                $this->addOwnerPrincipal($addressBooks[$row['id']]);
+            }
+            $result->closeCursor();
+
+            return array_values($addressBooks);
+        }, $this->db);
+    }
+
+    public function getUsersOwnAddressBooks($principalUri) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+            ->from('addressbooks')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+        $addressBooks = [];
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $addressBooks[$row['id']] = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], false),
+                '{DAV:}displayname' => $row['displayname'],
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+            ];
+
+            $this->addOwnerPrincipal($addressBooks[$row['id']]);
+        }
+        $result->closeCursor();
+
+        return array_values($addressBooks);
+    }
+
+    /**
+     * @param int $addressBookId
+     */
+    public function getAddressBookById(int $addressBookId): ?array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+            ->from('addressbooks')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
+            ->executeQuery();
+        $row = $result->fetch();
+        $result->closeCursor();
+        if (!$row) {
+            return null;
+        }
+
+        $addressBook = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $row['principaluri'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+            '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+        ];
+
+        $this->addOwnerPrincipal($addressBook);
+
+        return $addressBook;
+    }
+
+    public function getAddressBooksByUri(string $principal, string $addressBookUri): ?array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+            ->from('addressbooks')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($addressBookUri)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
+            ->setMaxResults(1)
+            ->executeQuery();
+
+        $row = $result->fetch();
+        $result->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $addressBook = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $row['principaluri'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+            '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+        ];
+
+        // system address books are always read only
+        if ($principal === 'principals/system/system') {
+            $addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
+        }
+
+        $this->addOwnerPrincipal($addressBook);
+
+        return $addressBook;
+    }
+
+    /**
+     * Updates properties for an address book.
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param string $addressBookId
+     * @param \Sabre\DAV\PropPatch $propPatch
+     * @return void
+     */
+    public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
+        $this->atomic(function () use ($addressBookId, $propPatch) {
+            $supportedProperties = [
+                '{DAV:}displayname',
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description',
+            ];
+
+            $propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
+                $updates = [];
+                foreach ($mutations as $property => $newValue) {
+                    switch ($property) {
+                        case '{DAV:}displayname':
+                            $updates['displayname'] = $newValue;
+                            break;
+                        case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+                            $updates['description'] = $newValue;
+                            break;
+                    }
+                }
+                $query = $this->db->getQueryBuilder();
+                $query->update('addressbooks');
+
+                foreach ($updates as $key => $value) {
+                    $query->set($key, $query->createNamedParameter($value));
+                }
+                $query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
+                    ->executeStatement();
+
+                $this->addChange($addressBookId, "", 2);
+
+                $addressBookRow = $this->getAddressBookById((int)$addressBookId);
+                $shares = $this->getShares((int)$addressBookId);
+                $this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
+
+                return true;
+            });
+        }, $this->db);
+    }
+
+    /**
+     * Creates a new address book
+     *
+     * @param string $principalUri
+     * @param string $url Just the 'basename' of the url.
+     * @param array $properties
+     * @return int
+     * @throws BadRequest
+     */
+    public function createAddressBook($principalUri, $url, array $properties) {
+        if (strlen($url) > 255) {
+            throw new BadRequest('URI too long. Address book not created');
+        }
+
+        $values = [
+            'displayname' => null,
+            'description' => null,
+            'principaluri' => $principalUri,
+            'uri' => $url,
+            'synctoken' => 1
+        ];
+
+        foreach ($properties as $property => $newValue) {
+            switch ($property) {
+                case '{DAV:}displayname':
+                    $values['displayname'] = $newValue;
+                    break;
+                case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+                    $values['description'] = $newValue;
+                    break;
+                default:
+                    throw new BadRequest('Unknown property: ' . $property);
+            }
+        }
+
+        // Fallback to make sure the displayname is set. Some clients may refuse
+        // to work with addressbooks not having a displayname.
+        if (is_null($values['displayname'])) {
+            $values['displayname'] = $url;
+        }
+
+        [$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
+            $query = $this->db->getQueryBuilder();
+            $query->insert('addressbooks')
+                ->values([
+                    'uri' => $query->createParameter('uri'),
+                    'displayname' => $query->createParameter('displayname'),
+                    'description' => $query->createParameter('description'),
+                    'principaluri' => $query->createParameter('principaluri'),
+                    'synctoken' => $query->createParameter('synctoken'),
+                ])
+                ->setParameters($values)
+                ->execute();
+
+            $addressBookId = $query->getLastInsertId();
+            return [
+                $addressBookId,
+                $this->getAddressBookById($addressBookId),
+            ];
+        }, $this->db);
+
+        $this->dispatcher->dispatchTyped(new AddressBookCreatedEvent($addressBookId, $addressBookRow));
+
+        return $addressBookId;
+    }
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param mixed $addressBookId
+     * @return void
+     */
+    public function deleteAddressBook($addressBookId) {
+        $this->atomic(function () use ($addressBookId) {
+            $addressBookId = (int)$addressBookId;
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete($this->dbCardsTable)
+                ->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
+                ->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete('addressbookchanges')
+                ->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
+                ->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete('addressbooks')
+                ->where($query->expr()->eq('id', $query->createParameter('id')))
+                ->setParameter('id', $addressBookId, IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+
+            $this->sharingBackend->deleteAllShares($addressBookId);
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete($this->dbCardsPropertiesTable)
+                ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
+                ->executeStatement();
+
+            if ($addressBookData) {
+                $this->dispatcher->dispatchTyped(new AddressBookDeletedEvent($addressBookId, $addressBookData, $shares));
+            }
+        }, $this->db);
+    }
+
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also omit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
+    public function getCards($addressbookId) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
+            ->from($this->dbCardsTable)
+            ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressbookId)));
+
+        $cards = [];
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $row['etag'] = '"' . $row['etag'] . '"';
+
+            $modified = false;
+            $row['carddata'] = $this->readBlob($row['carddata'], $modified);
+            if ($modified) {
+                $row['size'] = strlen($row['carddata']);
+            }
+
+            $cards[] = $row;
+        }
+        $result->closeCursor();
+
+        return $cards;
+    }
+
+    /**
+     * Returns a specific card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * If the card does not exist, you must return false.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
+    public function getCard($addressBookId, $cardUri) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
+            ->from($this->dbCardsTable)
+            ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
+            ->setMaxResults(1);
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        if (!$row) {
+            return false;
+        }
+        $row['etag'] = '"' . $row['etag'] . '"';
+
+        $modified = false;
+        $row['carddata'] = $this->readBlob($row['carddata'], $modified);
+        if ($modified) {
+            $row['size'] = strlen($row['carddata']);
+        }
+
+        return $row;
+    }
+
+    /**
+     * Returns a list of cards.
+     *
+     * This method should work identical to getCard, but instead return all the
+     * cards in the list as an array.
+     *
+     * If the backend supports this, it may allow for some speed-ups.
+     *
+     * @param mixed $addressBookId
+     * @param array $uris
+     * @return array
+     */
+    public function getMultipleCards($addressBookId, array $uris) {
+        if (empty($uris)) {
+            return [];
+        }
+
+        $chunks = array_chunk($uris, 100);
+        $cards = [];
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
+            ->from($this->dbCardsTable)
+            ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+            ->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
+
+        foreach ($chunks as $uris) {
+            $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->execute();
+
+            while ($row = $result->fetch()) {
+                $row['etag'] = '"' . $row['etag'] . '"';
+
+                $modified = false;
+                $row['carddata'] = $this->readBlob($row['carddata'], $modified);
+                if ($modified) {
+                    $row['size'] = strlen($row['carddata']);
+                }
+
+                $cards[] = $row;
+            }
+            $result->closeCursor();
+        }
+        return $cards;
+    }
+
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressBooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @param bool $checkAlreadyExists
+     * @return string
+     */
+    public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
+        $etag = md5($cardData);
+        $uid = $this->getUID($cardData);
+        return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
+            if ($checkAlreadyExists) {
+                $q = $this->db->getQueryBuilder();
+                $q->select('uid')
+                    ->from($this->dbCardsTable)
+                    ->where($q->expr()->eq('addressbookid', $q->createNamedParameter($addressBookId)))
+                    ->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
+                    ->setMaxResults(1);
+                $result = $q->executeQuery();
+                $count = (bool)$result->fetchOne();
+                $result->closeCursor();
+                if ($count) {
+                    throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
+                }
+            }
+
+            $query = $this->db->getQueryBuilder();
+            $query->insert('cards')
+                ->values([
+                    'carddata' => $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB),
+                    'uri' => $query->createNamedParameter($cardUri),
+                    'lastmodified' => $query->createNamedParameter(time()),
+                    'addressbookid' => $query->createNamedParameter($addressBookId),
+                    'size' => $query->createNamedParameter(strlen($cardData)),
+                    'etag' => $query->createNamedParameter($etag),
+                    'uid' => $query->createNamedParameter($uid),
+                ])
+                ->execute();
+
+            $etagCacheKey = "$addressBookId#$cardUri";
+            $this->etagCache[$etagCacheKey] = $etag;
+
+            $this->addChange($addressBookId, $cardUri, 1);
+            $this->updateProperties($addressBookId, $cardUri, $cardData);
+
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+            $objectRow = $this->getCard($addressBookId, $cardUri);
+            $this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
+
+            return '"' . $etag . '"';
+        }, $this->db);
+    }
+
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressBooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string
+     */
+    public function updateCard($addressBookId, $cardUri, $cardData) {
+        $uid = $this->getUID($cardData);
+        $etag = md5($cardData);
+
+        return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
+            $query = $this->db->getQueryBuilder();
+
+            // check for recently stored etag and stop if it is the same
+            $etagCacheKey = "$addressBookId#$cardUri";
+            if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
+                return '"' . $etag . '"';
+            }
+
+            $query->update($this->dbCardsTable)
+                ->set('carddata', $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB))
+                ->set('lastmodified', $query->createNamedParameter(time()))
+                ->set('size', $query->createNamedParameter(strlen($cardData)))
+                ->set('etag', $query->createNamedParameter($etag))
+                ->set('uid', $query->createNamedParameter($uid))
+                ->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
+                ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+                ->execute();
+
+            $this->etagCache[$etagCacheKey] = $etag;
+
+            $this->addChange($addressBookId, $cardUri, 2);
+            $this->updateProperties($addressBookId, $cardUri, $cardData);
+
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+            $objectRow = $this->getCard($addressBookId, $cardUri);
+            $this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
+            return '"' . $etag . '"';
+        }, $this->db);
+    }
+
+    /**
+     * Deletes a card
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return bool
+     */
+    public function deleteCard($addressBookId, $cardUri) {
+        return $this->atomic(function () use ($addressBookId, $cardUri) {
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+            $objectRow = $this->getCard($addressBookId, $cardUri);
+
+            try {
+                $cardId = $this->getCardId($addressBookId, $cardUri);
+            } catch (\InvalidArgumentException $e) {
+                $cardId = null;
+            }
+            $query = $this->db->getQueryBuilder();
+            $ret = $query->delete($this->dbCardsTable)
+                ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+                ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
+                ->executeStatement();
+
+            $this->addChange($addressBookId, $cardUri, 3);
+
+            if ($ret === 1) {
+                if ($cardId !== null) {
+                    $this->dispatcher->dispatchTyped(new CardDeletedEvent($addressBookId, $addressBookData, $shares, $objectRow));
+                    $this->purgeProperties($addressBookId, $cardId);
+                }
+                return true;
+            }
+
+            return false;
+        }, $this->db);
+    }
+
+    /**
+     * The getChanges method returns all the changes that have happened, since
+     * the specified syncToken in the specified address book.
+     *
+     * This function should return an array, such as the following:
+     *
+     * [
+     *   'syncToken' => 'The current synctoken',
+     *   'added'   => [
+     *      'new.txt',
+     *   ],
+     *   'modified'   => [
+     *      'modified.txt',
+     *   ],
+     *   'deleted' => [
+     *      'foo.php.bak',
+     *      'old.txt'
+     *   ]
+     * ];
+     *
+     * The returned syncToken property should reflect the *current* syncToken
+     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+     * property. This is needed here too, to ensure the operation is atomic.
+     *
+     * If the $syncToken argument is specified as null, this is an initial
+     * sync, and all members should be reported.
+     *
+     * The modified property is an array of nodenames that have changed since
+     * the last token.
+     *
+     * The deleted property is an array with nodenames, that have been deleted
+     * from collection.
+     *
+     * The $syncLevel argument is basically the 'depth' of the report. If it's
+     * 1, you only have to report changes that happened only directly in
+     * immediate descendants. If it's 2, it should also include changes from
+     * the nodes below the child collections. (grandchildren)
+     *
+     * The $limit argument allows a client to specify how many results should
+     * be returned at most. If the limit is not specified, it should be treated
+     * as infinite.
+     *
+     * If the limit (infinite or not) is higher than you're willing to return,
+     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+     *
+     * If the syncToken is expired (due to data cleanup) or unknown, you must
+     * return null.
+     *
+     * The limit is 'suggestive'. You are free to ignore it.
+     *
+     * @param string $addressBookId
+     * @param string $syncToken
+     * @param int $syncLevel
+     * @param int|null $limit
+     * @return array
+     */
+    public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
+        // Current synctoken
+        return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
+            $qb = $this->db->getQueryBuilder();
+            $qb->select('synctoken')
+                ->from('addressbooks')
+                ->where(
+                    $qb->expr()->eq('id', $qb->createNamedParameter($addressBookId))
+                );
+            $stmt = $qb->executeQuery();
+            $currentToken = $stmt->fetchOne();
+            $stmt->closeCursor();
+
+            if (is_null($currentToken)) {
+                return [];
+            }
+
+            $result = [
+                'syncToken' => $currentToken,
+                'added' => [],
+                'modified' => [],
+                'deleted' => [],
+            ];
+
+            if ($syncToken) {
+                $qb = $this->db->getQueryBuilder();
+                $qb->select('uri', 'operation')
+                    ->from('addressbookchanges')
+                    ->where(
+                        $qb->expr()->andX(
+                            $qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
+                            $qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
+                            $qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
+                        )
+                    )->orderBy('synctoken');
+
+                if (is_int($limit) && $limit > 0) {
+                    $qb->setMaxResults($limit);
+                }
+
+                // Fetching all changes
+                $stmt = $qb->executeQuery();
+
+                $changes = [];
+
+                // This loop ensures that any duplicates are overwritten, only the
+                // last change on a node is relevant.
+                while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                    $changes[$row['uri']] = $row['operation'];
+                }
+                $stmt->closeCursor();
+
+                foreach ($changes as $uri => $operation) {
+                    switch ($operation) {
+                        case 1:
+                            $result['added'][] = $uri;
+                            break;
+                        case 2:
+                            $result['modified'][] = $uri;
+                            break;
+                        case 3:
+                            $result['deleted'][] = $uri;
+                            break;
+                    }
+                }
+            } else {
+                $qb = $this->db->getQueryBuilder();
+                $qb->select('uri')
+                    ->from('cards')
+                    ->where(
+                        $qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
+                    );
+                // No synctoken supplied, this is the initial sync.
+                $stmt = $qb->executeQuery();
+                $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+                $stmt->closeCursor();
+            }
+            return $result;
+        }, $this->db);
+    }
+
+    /**
+     * Adds a change record to the addressbookchanges table.
+     *
+     * @param mixed $addressBookId
+     * @param string $objectUri
+     * @param int $operation 1 = add, 2 = modify, 3 = delete
+     * @return void
+     */
+    protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
+        $this->atomic(function () use ($addressBookId, $objectUri, $operation) {
+            $query = $this->db->getQueryBuilder();
+            $query->select('synctoken')
+                ->from('addressbooks')
+                ->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
+            $result = $query->executeQuery();
+            $syncToken = (int)$result->fetchOne();
+            $result->closeCursor();
+
+            $query = $this->db->getQueryBuilder();
+            $query->insert('addressbookchanges')
+                ->values([
+                    'uri' => $query->createNamedParameter($objectUri),
+                    'synctoken' => $query->createNamedParameter($syncToken),
+                    'addressbookid' => $query->createNamedParameter($addressBookId),
+                    'operation' => $query->createNamedParameter($operation),
+                ])
+                ->executeStatement();
+
+            $query = $this->db->getQueryBuilder();
+            $query->update('addressbooks')
+                ->set('synctoken', $query->createNamedParameter($syncToken + 1, IQueryBuilder::PARAM_INT))
+                ->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
+                ->executeStatement();
+        }, $this->db);
+    }
+
+    /**
+     * @param resource|string $cardData
+     * @param bool $modified
+     * @return string
+     */
+    private function readBlob($cardData, &$modified = false) {
+        if (is_resource($cardData)) {
+            $cardData = stream_get_contents($cardData);
+        }
+
+        // Micro optimisation
+        // don't loop through
+        if (strpos($cardData, 'PHOTO:data:') === 0) {
+            return $cardData;
+        }
+
+        $cardDataArray = explode("\r\n", $cardData);
+
+        $cardDataFiltered = [];
+        $removingPhoto = false;
+        foreach ($cardDataArray as $line) {
+            if (strpos($line, 'PHOTO:data:') === 0
+                && strpos($line, 'PHOTO:data:image/') !== 0) {
+                // Filter out PHOTO data of non-images
+                $removingPhoto = true;
+                $modified = true;
+                continue;
+            }
+
+            if ($removingPhoto) {
+                if (strpos($line, ' ') === 0) {
+                    continue;
+                }
+                // No leading space means this is a new property
+                $removingPhoto = false;
+            }
+
+            $cardDataFiltered[] = $line;
+        }
+        return implode("\r\n", $cardDataFiltered);
+    }
+
+    /**
+     * @param list<array{href: string, commonName: string, readOnly: bool}> $add
+     * @param list<string> $remove
+     */
+    public function updateShares(IShareable $shareable, array $add, array $remove): void {
+        $this->atomic(function () use ($shareable, $add, $remove) {
+            $addressBookId = $shareable->getResourceId();
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $oldShares = $this->getShares($addressBookId);
+
+            $this->sharingBackend->updateShares($shareable, $add, $remove);
+
+            $this->dispatcher->dispatchTyped(new AddressBookShareUpdatedEvent($addressBookId, $addressBookData, $oldShares, $add, $remove));
+        }, $this->db);
+    }
+
+    /**
+     * Search contacts in a specific address-book
+     *
+     * @param int $addressBookId
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options = array() to define the search behavior
+     * 	  - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
+     *    - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
+     *    - 'limit' - Set a numeric limit for the search results
+     *    - 'offset' - Set the offset for the limited search results
+     *    - 'wildcard' - Whether the search should use wildcards
+     * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
+     * @return array an array of contacts which are arrays of key-value-pairs
+     */
+    public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
+        return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
+            return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
+        }, $this->db);
+    }
+
+    /**
+     * Search contacts in all address-books accessible by a user
+     *
+     * @param string $principalUri
+     * @param string $pattern
+     * @param array $searchProperties
+     * @param array $options
+     * @return array
+     */
+    public function searchPrincipalUri(string $principalUri,
+                                        string $pattern,
+                                        array $searchProperties,
+                                        array $options = []): array {
+        return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
+            $addressBookIds = array_map(static function ($row):int {
+                return (int) $row['id'];
+            }, $this->getAddressBooksForUser($principalUri));
+
+            return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
+        }, $this->db);
+    }
+
+    /**
+     * @param array $addressBookIds
+     * @param string $pattern
+     * @param array $searchProperties
+     * @param array $options
+     * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
+     * @return array
+     */
+    private function searchByAddressBookIds(array $addressBookIds,
+                                            string $pattern,
+                                            array $searchProperties,
+                                            array $options = []): array {
+        $escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
+        $useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
+
+        $query2 = $this->db->getQueryBuilder();
+
+        $addressBookOr = $query2->expr()->orX();
+        foreach ($addressBookIds as $addressBookId) {
+            $addressBookOr->add($query2->expr()->eq('cp.addressbookid', $query2->createNamedParameter($addressBookId)));
+        }
+
+        if ($addressBookOr->count() === 0) {
+            return [];
+        }
+
+        $propertyOr = $query2->expr()->orX();
+        foreach ($searchProperties as $property) {
+            if ($escapePattern) {
+                if ($property === 'EMAIL' && strpos($pattern, ' ') !== false) {
+                    // There can be no spaces in emails
+                    continue;
+                }
+
+                if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) {
+                    // There can be no chars in cloud ids which are not valid for user ids plus :/
+                    // worst case: CA61590A-BBBC-423E-84AF-E6DF01455A53@https://my.nxt/srv/
+                    continue;
+                }
+            }
+
+            $propertyOr->add($query2->expr()->eq('cp.name', $query2->createNamedParameter($property)));
+        }
+
+        if ($propertyOr->count() === 0) {
+            return [];
+        }
+
+        $query2->selectDistinct('cp.cardid')
+            ->from($this->dbCardsPropertiesTable, 'cp')
+            ->andWhere($addressBookOr)
+            ->andWhere($propertyOr);
+
+        // No need for like when the pattern is empty
+        if ('' !== $pattern) {
+            if (!$useWildcards) {
+                $query2->andWhere($query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
+            } elseif (!$escapePattern) {
+                $query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
+            } else {
+                $query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+            }
+        }
+
+        if (isset($options['limit'])) {
+            $query2->setMaxResults($options['limit']);
+        }
+        if (isset($options['offset'])) {
+            $query2->setFirstResult($options['offset']);
+        }
+
+        $result = $query2->execute();
+        $matches = $result->fetchAll();
+        $result->closeCursor();
+        $matches = array_map(function ($match) {
+            return (int)$match['cardid'];
+        }, $matches);
+
+        $cards = [];
+        $query = $this->db->getQueryBuilder();
+        $query->select('c.addressbookid', 'c.carddata', 'c.uri')
+            ->from($this->dbCardsTable, 'c')
+            ->where($query->expr()->in('c.id', $query->createParameter('matches')));
+
+        foreach (array_chunk($matches, 1000) as $matchesChunk) {
+            $query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY);
+            $result = $query->executeQuery();
+            $cards = array_merge($cards, $result->fetchAll());
+            $result->closeCursor();
+        }
+
+        return array_map(function ($array) {
+            $array['addressbookid'] = (int) $array['addressbookid'];
+            $modified = false;
+            $array['carddata'] = $this->readBlob($array['carddata'], $modified);
+            if ($modified) {
+                $array['size'] = strlen($array['carddata']);
+            }
+            return $array;
+        }, $cards);
+    }
+
+    /**
+     * @param int $bookId
+     * @param string $name
+     * @return array
+     */
+    public function collectCardProperties($bookId, $name) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->selectDistinct('value')
+            ->from($this->dbCardsPropertiesTable)
+            ->where($query->expr()->eq('name', $query->createNamedParameter($name)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
+            ->execute();
+
+        $all = $result->fetchAll(PDO::FETCH_COLUMN);
+        $result->closeCursor();
+
+        return $all;
+    }
+
+    /**
+     * get URI from a given contact
+     *
+     * @param int $id
+     * @return string
+     */
+    public function getCardUri($id) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('uri')->from($this->dbCardsTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+
+        $result = $query->execute();
+        $uri = $result->fetch();
+        $result->closeCursor();
+
+        if (!isset($uri['uri'])) {
+            throw new \InvalidArgumentException('Card does not exists: ' . $id);
+        }
+
+        return $uri['uri'];
+    }
+
+    /**
+     * return contact with the given URI
+     *
+     * @param int $addressBookId
+     * @param string $uri
+     * @returns array
+     */
+    public function getContact($addressBookId, $uri) {
+        $result = [];
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')->from($this->dbCardsTable)
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
+        $queryResult = $query->execute();
+        $contact = $queryResult->fetch();
+        $queryResult->closeCursor();
+
+        if (is_array($contact)) {
+            $modified = false;
+            $contact['etag'] = '"' . $contact['etag'] . '"';
+            $contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
+            if ($modified) {
+                $contact['size'] = strlen($contact['carddata']);
+            }
+
+            $result = $contact;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the list of people whom this address book is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *
+     * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
+     */
+    public function getShares(int $addressBookId): array {
+        return $this->sharingBackend->getShares($addressBookId);
+    }
+
+    /**
+     * update properties table
+     *
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param string $vCardSerialized
+     */
+    protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
+        $this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized) {
+            $cardId = $this->getCardId($addressBookId, $cardUri);
+            $vCard = $this->readCard($vCardSerialized);
+
+            $this->purgeProperties($addressBookId, $cardId);
+
+            $query = $this->db->getQueryBuilder();
+            $query->insert($this->dbCardsPropertiesTable)
+                ->values(
+                    [
+                        'addressbookid' => $query->createNamedParameter($addressBookId),
+                        'cardid' => $query->createNamedParameter($cardId),
+                        'name' => $query->createParameter('name'),
+                        'value' => $query->createParameter('value'),
+                        'preferred' => $query->createParameter('preferred')
+                    ]
+                );
+
+            foreach ($vCard->children() as $property) {
+                if (!in_array($property->name, self::$indexProperties)) {
+                    continue;
+                }
+                $preferred = 0;
+                foreach ($property->parameters as $parameter) {
+                    if ($parameter->name === 'TYPE' && strtoupper($parameter->getValue()) === 'PREF') {
+                        $preferred = 1;
+                        break;
+                    }
+                }
+                $query->setParameter('name', $property->name);
+                $query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
+                $query->setParameter('preferred', $preferred);
+                $query->execute();
+            }
+        }, $this->db);
+    }
+
+    /**
+     * read vCard data into a vCard object
+     *
+     * @param string $cardData
+     * @return VCard
+     */
+    protected function readCard($cardData) {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * delete all properties from a given card
+     *
+     * @param int $addressBookId
+     * @param int $cardId
+     */
+    protected function purgeProperties($addressBookId, $cardId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbCardsPropertiesTable)
+            ->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
+        $query->execute();
+    }
+
+    /**
+     * Get ID from a given contact
+     */
+    protected function getCardId(int $addressBookId, string $uri): int {
+        $query = $this->db->getQueryBuilder();
+        $query->select('id')->from($this->dbCardsTable)
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
+
+        $result = $query->execute();
+        $cardIds = $result->fetch();
+        $result->closeCursor();
+
+        if (!isset($cardIds['id'])) {
+            throw new \InvalidArgumentException('Card does not exists: ' . $uri);
+        }
+
+        return (int)$cardIds['id'];
+    }
+
+    /**
+     * For shared address books the sharee is set in the ACL of the address book
+     *
+     * @param int $addressBookId
+     * @param list<array{privilege: string, principal: string, protected: bool}> $acl
+     * @return list<array{privilege: string, principal: string, protected: bool}>
+     */
+    public function applyShareAcl(int $addressBookId, array $acl): array {
+        return $this->sharingBackend->applyShareAcl($addressBookId, $acl);
+    }
+
+    /**
+     * @throws \InvalidArgumentException
+     */
+    public function pruneOutdatedSyncTokens(int $keep = 10_000): int {
+        if ($keep < 0) {
+            throw new \InvalidArgumentException();
+        }
+        $query = $this->db->getQueryBuilder();
+        $query->delete('addressbookchanges')
+            ->orderBy('id', 'DESC')
+            ->setFirstResult($keep);
+        return $query->executeStatement();
+    }
+
+    private function convertPrincipal(string $principalUri, bool $toV2): string {
+        if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
+            [, $name] = \Sabre\Uri\split($principalUri);
+            if ($toV2 === true) {
+                return "principals/users/$name";
+            }
+            return "principals/$name";
+        }
+        return $principalUri;
+    }
+
+    private function addOwnerPrincipal(array &$addressbookInfo): void {
+        $ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
+        $displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+        if (isset($addressbookInfo[$ownerPrincipalKey])) {
+            $uri = $addressbookInfo[$ownerPrincipalKey];
+        } else {
+            $uri = $addressbookInfo['principaluri'];
+        }
+
+        $principalInformation = $this->principalBackend->getPrincipalByPath($uri);
+        if (isset($principalInformation['{DAV:}displayname'])) {
+            $addressbookInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
+        }
+    }
+
+    /**
+     * Extract UID from vcard
+     *
+     * @param string $cardData the vcard raw data
+     * @return string the uid
+     * @throws BadRequest if no UID is available or vcard is empty
+     */
+    private function getUID(string $cardData): string {
+        if ($cardData !== '') {
+            $vCard = Reader::read($cardData);
+            if ($vCard->UID) {
+                $uid = $vCard->UID->getValue();
+                return $uid;
+            }
+            // should already be handled, but just in case
+            throw new BadRequest('vCards on CardDAV servers MUST have a UID property');
+        }
+        // should already be handled, but just in case
+        throw new BadRequest('vCard can not be empty');
+    }
 }

Spacing +52 added lines, -52 removed lines

@@ -143,7 +143,7 @@ 
 	 * @return array
 	 */
 	public function getAddressBooksForUser($principalUri) {
-		return $this->atomic(function () use ($principalUri) {
+		return $this->atomic(function() use ($principalUri) {
 			$principalUriOriginal = $principalUri;
 			$principalUri = $this->convertPrincipal($principalUri, true);
 			$query = $this->db->getQueryBuilder();
@@ -160,7 +160,7 @@ 
 					'uri' => $row['uri'],
 					'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 					'{DAV:}displayname' => $row['displayname'],
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+					'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 				];
@@ -185,13 +185,13 @@ 
 				->setParameter('principaluri', $principals, IQueryBuilder::PARAM_STR_ARRAY)
 				->execute();
 
-			$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+			$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
 			while ($row = $result->fetch()) {
 				if ($row['principaluri'] === $principalUri) {
 					continue;
 				}
 
-				$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
+				$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
 				if (isset($addressBooks[$row['id']])) {
 					if ($readOnly) {
 						// New share can not have more permissions then the old one.
@@ -205,18 +205,18 @@ 
 				}
 
 				[, $name] = \Sabre\Uri\split($row['principaluri']);
-				$uri = $row['uri'] . '_shared_by_' . $name;
-				$displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
+				$uri = $row['uri'].'_shared_by_'.$name;
+				$displayName = $row['displayname'].' ('.($this->userManager->getDisplayName($name) ?? $name ?? '').')';
 
 				$addressBooks[$row['id']] = [
 					'id' => $row['id'],
 					'uri' => $uri,
 					'principaluri' => $principalUriOriginal,
 					'{DAV:}displayname' => $displayName,
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+					'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
+					'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $row['principaluri'],
 					$readOnlyPropertyName => $readOnly,
 				];
 
@@ -244,7 +244,7 @@ 
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 				'{DAV:}displayname' => $row['displayname'],
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 				'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 			];
@@ -276,7 +276,7 @@ 
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 		];
@@ -306,14 +306,14 @@ 
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 		];
 
 		// system address books are always read only
 		if ($principal === 'principals/system/system') {
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
+			$addressBook['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only'] = true;
 		}
 
 		$this->addOwnerPrincipal($addressBook);
@@ -338,20 +338,20 @@ 
 	 * @return void
 	 */
 	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
-		$this->atomic(function () use ($addressBookId, $propPatch) {
+		$this->atomic(function() use ($addressBookId, $propPatch) {
 			$supportedProperties = [
 				'{DAV:}displayname',
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description',
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description',
 			];
 
-			$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
+			$propPatch->handle($supportedProperties, function($mutations) use ($addressBookId) {
 				$updates = [];
 				foreach ($mutations as $property => $newValue) {
 					switch ($property) {
 						case '{DAV:}displayname':
 							$updates['displayname'] = $newValue;
 							break;
-						case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+						case '{'.Plugin::NS_CARDDAV.'}addressbook-description':
 							$updates['description'] = $newValue;
 							break;
 					}
@@ -367,9 +367,9 @@ 
 
 				$this->addChange($addressBookId, "", 2);
 
-				$addressBookRow = $this->getAddressBookById((int)$addressBookId);
-				$shares = $this->getShares((int)$addressBookId);
-				$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
+				$addressBookRow = $this->getAddressBookById((int) $addressBookId);
+				$shares = $this->getShares((int) $addressBookId);
+				$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int) $addressBookId, $addressBookRow, $shares, $mutations));
 
 				return true;
 			});
@@ -403,11 +403,11 @@ 
 				case '{DAV:}displayname':
 					$values['displayname'] = $newValue;
 					break;
-				case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+				case '{'.Plugin::NS_CARDDAV.'}addressbook-description':
 					$values['description'] = $newValue;
 					break;
 				default:
-					throw new BadRequest('Unknown property: ' . $property);
+					throw new BadRequest('Unknown property: '.$property);
 			}
 		}
 
@@ -417,7 +417,7 @@ 
 			$values['displayname'] = $url;
 		}
 
-		[$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
+		[$addressBookId, $addressBookRow] = $this->atomic(function() use ($values) {
 			$query = $this->db->getQueryBuilder();
 			$query->insert('addressbooks')
 				->values([
@@ -449,8 +449,8 @@ 
 	 * @return void
 	 */
 	public function deleteAddressBook($addressBookId) {
-		$this->atomic(function () use ($addressBookId) {
-			$addressBookId = (int)$addressBookId;
+		$this->atomic(function() use ($addressBookId) {
+			$addressBookId = (int) $addressBookId;
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$shares = $this->getShares($addressBookId);
 
@@ -514,7 +514,7 @@ 
 
 		$result = $query->execute();
 		while ($row = $result->fetch()) {
-			$row['etag'] = '"' . $row['etag'] . '"';
+			$row['etag'] = '"'.$row['etag'].'"';
 
 			$modified = false;
 			$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -554,7 +554,7 @@ 
 		if (!$row) {
 			return false;
 		}
-		$row['etag'] = '"' . $row['etag'] . '"';
+		$row['etag'] = '"'.$row['etag'].'"';
 
 		$modified = false;
 		$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -596,7 +596,7 @@ 
 			$result = $query->execute();
 
 			while ($row = $result->fetch()) {
-				$row['etag'] = '"' . $row['etag'] . '"';
+				$row['etag'] = '"'.$row['etag'].'"';
 
 				$modified = false;
 				$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -640,7 +640,7 @@ 
 	public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
 		$etag = md5($cardData);
 		$uid = $this->getUID($cardData);
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
+		return $this->atomic(function() use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
 			if ($checkAlreadyExists) {
 				$q = $this->db->getQueryBuilder();
 				$q->select('uid')
@@ -649,7 +649,7 @@ 
 					->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
 					->setMaxResults(1);
 				$result = $q->executeQuery();
-				$count = (bool)$result->fetchOne();
+				$count = (bool) $result->fetchOne();
 				$result->closeCursor();
 				if ($count) {
 					throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
@@ -680,7 +680,7 @@ 
 			$objectRow = $this->getCard($addressBookId, $cardUri);
 			$this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
 
-			return '"' . $etag . '"';
+			return '"'.$etag.'"';
 		}, $this->db);
 	}
 
@@ -713,13 +713,13 @@ 
 		$uid = $this->getUID($cardData);
 		$etag = md5($cardData);
 
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
+		return $this->atomic(function() use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
 			$query = $this->db->getQueryBuilder();
 
 			// check for recently stored etag and stop if it is the same
 			$etagCacheKey = "$addressBookId#$cardUri";
 			if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
-				return '"' . $etag . '"';
+				return '"'.$etag.'"';
 			}
 
 			$query->update($this->dbCardsTable)
@@ -741,7 +741,7 @@ 
 			$shares = $this->getShares($addressBookId);
 			$objectRow = $this->getCard($addressBookId, $cardUri);
 			$this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-			return '"' . $etag . '"';
+			return '"'.$etag.'"';
 		}, $this->db);
 	}
 
@@ -753,7 +753,7 @@ 
 	 * @return bool
 	 */
 	public function deleteCard($addressBookId, $cardUri) {
-		return $this->atomic(function () use ($addressBookId, $cardUri) {
+		return $this->atomic(function() use ($addressBookId, $cardUri) {
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$shares = $this->getShares($addressBookId);
 			$objectRow = $this->getCard($addressBookId, $cardUri);
@@ -841,7 +841,7 @@ 
 	 */
 	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
 		// Current synctoken
-		return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
+		return $this->atomic(function() use ($addressBookId, $syncToken, $syncLevel, $limit) {
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('synctoken')
 				->from('addressbooks')
@@ -929,13 +929,13 @@ 
 	 * @return void
 	 */
 	protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
-		$this->atomic(function () use ($addressBookId, $objectUri, $operation) {
+		$this->atomic(function() use ($addressBookId, $objectUri, $operation) {
 			$query = $this->db->getQueryBuilder();
 			$query->select('synctoken')
 				->from('addressbooks')
 				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
 			$result = $query->executeQuery();
-			$syncToken = (int)$result->fetchOne();
+			$syncToken = (int) $result->fetchOne();
 			$result->closeCursor();
 
 			$query = $this->db->getQueryBuilder();
@@ -1003,7 +1003,7 @@ 
 	 * @param list<string> $remove
 	 */
 	public function updateShares(IShareable $shareable, array $add, array $remove): void {
-		$this->atomic(function () use ($shareable, $add, $remove) {
+		$this->atomic(function() use ($shareable, $add, $remove) {
 			$addressBookId = $shareable->getResourceId();
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$oldShares = $this->getShares($addressBookId);
@@ -1030,7 +1030,7 @@ 
 	 * @return array an array of contacts which are arrays of key-value-pairs
 	 */
 	public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
-		return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
+		return $this->atomic(function() use ($addressBookId, $pattern, $searchProperties, $options) {
 			return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
 		}, $this->db);
 	}
@@ -1048,8 +1048,8 @@ 
 									   string $pattern,
 									   array $searchProperties,
 									   array $options = []): array {
-		return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
-			$addressBookIds = array_map(static function ($row):int {
+		return $this->atomic(function() use ($principalUri, $pattern, $searchProperties, $options) {
+			$addressBookIds = array_map(static function($row):int {
 				return (int) $row['id'];
 			}, $this->getAddressBooksForUser($principalUri));
 
@@ -1117,7 +1117,7 @@ 
 			} elseif (!$escapePattern) {
 				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
 			} else {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%'.$this->db->escapeLikeParameter($pattern).'%')));
 			}
 		}
 
@@ -1131,8 +1131,8 @@ 
 		$result = $query2->execute();
 		$matches = $result->fetchAll();
 		$result->closeCursor();
-		$matches = array_map(function ($match) {
-			return (int)$match['cardid'];
+		$matches = array_map(function($match) {
+			return (int) $match['cardid'];
 		}, $matches);
 
 		$cards = [];
@@ -1148,7 +1148,7 @@ 
 			$result->closeCursor();
 		}
 
-		return array_map(function ($array) {
+		return array_map(function($array) {
 			$array['addressbookid'] = (int) $array['addressbookid'];
 			$modified = false;
 			$array['carddata'] = $this->readBlob($array['carddata'], $modified);
@@ -1195,7 +1195,7 @@ 
 		$result->closeCursor();
 
 		if (!isset($uri['uri'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $id);
+			throw new \InvalidArgumentException('Card does not exists: '.$id);
 		}
 
 		return $uri['uri'];
@@ -1220,7 +1220,7 @@ 
 
 		if (is_array($contact)) {
 			$modified = false;
-			$contact['etag'] = '"' . $contact['etag'] . '"';
+			$contact['etag'] = '"'.$contact['etag'].'"';
 			$contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
 			if ($modified) {
 				$contact['size'] = strlen($contact['carddata']);
@@ -1255,7 +1255,7 @@ 
 	 * @param string $vCardSerialized
 	 */
 	protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
-		$this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized) {
+		$this->atomic(function() use ($addressBookId, $cardUri, $vCardSerialized) {
 			$cardId = $this->getCardId($addressBookId, $cardUri);
 			$vCard = $this->readCard($vCardSerialized);
 
@@ -1330,10 +1330,10 @@ 
 		$result->closeCursor();
 
 		if (!isset($cardIds['id'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $uri);
+			throw new \InvalidArgumentException('Card does not exists: '.$uri);
 		}
 
-		return (int)$cardIds['id'];
+		return (int) $cardIds['id'];
 	}
 
 	/**
@@ -1373,8 +1373,8 @@ 
 	}
 
 	private function addOwnerPrincipal(array &$addressbookInfo): void {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+		$ownerPrincipalKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal';
+		$displaynameKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname';
 		if (isset($addressbookInfo[$ownerPrincipalKey])) {
 			$uri = $addressbookInfo[$ownerPrincipalKey];
 		} else {

apps/dav/lib/CardDAV/UserAddressBooks.php

Indentation +118 added lines, -118 removed lines

@@ -48,122 +48,122 @@
 use Sabre\DAV\MkCol;
 
 class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
-	/** @var IL10N */
-	protected $l10n;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var PluginManager */
-	private $pluginManager;
-	private ?IUser $user;
-	private ?IGroupManager $groupManager;
-
-	public function __construct(Backend\BackendInterface $carddavBackend,
-								string $principalUri,
-								PluginManager $pluginManager,
-								?IUser $user,
-								?IGroupManager $groupManager) {
-		parent::__construct($carddavBackend, $principalUri);
-		$this->pluginManager = $pluginManager;
-		$this->user = $user;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns a list of address books
-	 *
-	 * @return IAddressBook[]
-	 */
-	public function getChildren() {
-		if ($this->l10n === null) {
-			$this->l10n = \OC::$server->getL10N('dav');
-		}
-		if ($this->config === null) {
-			$this->config = \OC::$server->getConfig();
-		}
-
-		/** @var string|array $principal */
-		$principal = $this->principalUri;
-		$addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
-		// add the system address book
-		$systemAddressBook = null;
-		if (is_string($principal) && $principal !== 'principals/system/system' && $this->carddavBackend instanceof CardDavBackend) {
-			$systemAddressBook = $this->carddavBackend->getAddressBooksByUri('principals/system/system', 'system');
-			if ($systemAddressBook !== null) {
-				$systemAddressBook['uri'] = SystemAddressbook::URI_SHARED;
-			}
-		}
-		if (!is_null($systemAddressBook)) {
-			$addressBooks[] = $systemAddressBook;
-		}
-
-		$objects = [];
-		if (!empty($addressBooks)) {
-			/** @var IAddressBook[] $objects */
-			$objects = array_map(function (array $addressBook) {
-				$trustedServers = null;
-				$request = null;
-				try {
-					$trustedServers = \OC::$server->get(TrustedServers::class);
-					$request = \OC::$server->get(IRequest::class);
-				} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
-					// nothing to do, the request / trusted servers don't exist
-				}
-				if ($addressBook['principaluri'] === 'principals/system/system') {
-					return new SystemAddressbook(
-						$this->carddavBackend,
-						$addressBook,
-						$this->l10n,
-						$this->config,
-						\OCP\Server::get(IUserSession::class),
-						$request,
-						$trustedServers,
-						$this->groupManager
-					);
-				}
-
-				return new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
-			}, $addressBooks);
-		}
-		/** @var IAddressBook[][] $objectsFromPlugins */
-		$objectsFromPlugins = array_map(function (IAddressBookProvider $plugin): array {
-			return $plugin->fetchAllForAddressBookHome($this->principalUri);
-		}, $this->pluginManager->getAddressBookPlugins());
-
-		return array_merge($objects, ...$objectsFromPlugins);
-	}
-
-	public function createExtendedCollection($name, MkCol $mkCol) {
-		if (ExternalAddressBook::doesViolateReservedName($name)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	public function getACL() {
-		$acl = parent::getACL();
-		if ($this->principalUri === 'principals/system/system') {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			];
-		}
-
-		return $acl;
-	}
+    /** @var IL10N */
+    protected $l10n;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var PluginManager */
+    private $pluginManager;
+    private ?IUser $user;
+    private ?IGroupManager $groupManager;
+
+    public function __construct(Backend\BackendInterface $carddavBackend,
+                                string $principalUri,
+                                PluginManager $pluginManager,
+                                ?IUser $user,
+                                ?IGroupManager $groupManager) {
+        parent::__construct($carddavBackend, $principalUri);
+        $this->pluginManager = $pluginManager;
+        $this->user = $user;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns a list of address books
+     *
+     * @return IAddressBook[]
+     */
+    public function getChildren() {
+        if ($this->l10n === null) {
+            $this->l10n = \OC::$server->getL10N('dav');
+        }
+        if ($this->config === null) {
+            $this->config = \OC::$server->getConfig();
+        }
+
+        /** @var string|array $principal */
+        $principal = $this->principalUri;
+        $addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
+        // add the system address book
+        $systemAddressBook = null;
+        if (is_string($principal) && $principal !== 'principals/system/system' && $this->carddavBackend instanceof CardDavBackend) {
+            $systemAddressBook = $this->carddavBackend->getAddressBooksByUri('principals/system/system', 'system');
+            if ($systemAddressBook !== null) {
+                $systemAddressBook['uri'] = SystemAddressbook::URI_SHARED;
+            }
+        }
+        if (!is_null($systemAddressBook)) {
+            $addressBooks[] = $systemAddressBook;
+        }
+
+        $objects = [];
+        if (!empty($addressBooks)) {
+            /** @var IAddressBook[] $objects */
+            $objects = array_map(function (array $addressBook) {
+                $trustedServers = null;
+                $request = null;
+                try {
+                    $trustedServers = \OC::$server->get(TrustedServers::class);
+                    $request = \OC::$server->get(IRequest::class);
+                } catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
+                    // nothing to do, the request / trusted servers don't exist
+                }
+                if ($addressBook['principaluri'] === 'principals/system/system') {
+                    return new SystemAddressbook(
+                        $this->carddavBackend,
+                        $addressBook,
+                        $this->l10n,
+                        $this->config,
+                        \OCP\Server::get(IUserSession::class),
+                        $request,
+                        $trustedServers,
+                        $this->groupManager
+                    );
+                }
+
+                return new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
+            }, $addressBooks);
+        }
+        /** @var IAddressBook[][] $objectsFromPlugins */
+        $objectsFromPlugins = array_map(function (IAddressBookProvider $plugin): array {
+            return $plugin->fetchAllForAddressBookHome($this->principalUri);
+        }, $this->pluginManager->getAddressBookPlugins());
+
+        return array_merge($objects, ...$objectsFromPlugins);
+    }
+
+    public function createExtendedCollection($name, MkCol $mkCol) {
+        if (ExternalAddressBook::doesViolateReservedName($name)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+        $acl = parent::getACL();
+        if ($this->principalUri === 'principals/system/system') {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ];
+        }
+
+        return $acl;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 		$objects = [];
 		if (!empty($addressBooks)) {
 			/** @var IAddressBook[] $objects */
-			$objects = array_map(function (array $addressBook) {
+			$objects = array_map(function(array $addressBook) {
 				$trustedServers = null;
 				$request = null;
 				try {
@@ -127,7 +127,7 @@ 
 			}, $addressBooks);
 		}
 		/** @var IAddressBook[][] $objectsFromPlugins */
-		$objectsFromPlugins = array_map(function (IAddressBookProvider $plugin): array {
+		$objectsFromPlugins = array_map(function(IAddressBookProvider $plugin): array {
 			return $plugin->fetchAllForAddressBookHome($this->principalUri);
 		}, $this->pluginManager->getAddressBookPlugins());
 

apps/dav/lib/CardDAV/SyncService.php

Indentation +244 added lines, -244 removed lines

@@ -41,248 +41,248 @@
 use Sabre\VObject\Reader;
 
 class SyncService {
-	private CardDavBackend $backend;
-	private IUserManager $userManager;
-	private LoggerInterface $logger;
-	private ?array $localSystemAddressBook = null;
-	private Converter $converter;
-	protected string $certPath;
-
-	public function __construct(CardDavBackend $backend,
-								IUserManager $userManager,
-								LoggerInterface $logger,
-								Converter $converter) {
-		$this->backend = $backend;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->converter = $converter;
-		$this->certPath = '';
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	public function syncRemoteAddressBook(string $url, string $userName, string $addressBookUrl, string $sharedSecret, ?string $syncToken, string $targetBookHash, string $targetPrincipal, array $targetProperties): string {
-		// 1. create addressbook
-		$book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookHash, $targetProperties);
-		$addressBookId = $book['id'];
-
-		// 2. query changes
-		try {
-			$response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
-		} catch (ClientHttpException $ex) {
-			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-				// remote server revoked access to the address book, remove it
-				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->error('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
-				throw $ex;
-			}
-			$this->logger->error('Client exception:', ['app' => 'dav', 'exception' => $ex]);
-			throw $ex;
-		}
-
-		// 3. apply changes
-		// TODO: use multi-get for download
-		foreach ($response['response'] as $resource => $status) {
-			$cardUri = basename($resource);
-			if (isset($status[200])) {
-				$vCard = $this->download($url, $userName, $sharedSecret, $resource);
-				$existingCard = $this->backend->getCard($addressBookId, $cardUri);
-				if ($existingCard === false) {
-					$this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
-				}
-			} else {
-				$this->backend->deleteCard($addressBookId, $cardUri);
-			}
-		}
-
-		return $response['token'];
-	}
-
-	/**
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureSystemAddressBookExists(string $principal, string $uri, array $properties): ?array {
-		$book = $this->backend->getAddressBooksByUri($principal, $uri);
-		if (!is_null($book)) {
-			return $book;
-		}
-		// FIXME This might break in clustered DB setup
-		$this->backend->createAddressBook($principal, $uri, $properties);
-
-		return $this->backend->getAddressBooksByUri($principal, $uri);
-	}
-
-	/**
-	 * Check if there is a valid certPath we should use
-	 */
-	protected function getCertPath(): string {
-
-		// we already have a valid certPath
-		if ($this->certPath !== '') {
-			return $this->certPath;
-		}
-
-		$certManager = \OC::$server->getCertificateManager();
-		$certPath = $certManager->getAbsoluteBundlePath();
-		if (file_exists($certPath)) {
-			$this->certPath = $certPath;
-		}
-
-		return $this->certPath;
-	}
-
-	protected function getClient(string $url, string $userName, string $sharedSecret): Client {
-		$settings = [
-			'baseUri' => $url . '/',
-			'userName' => $userName,
-			'password' => $sharedSecret,
-		];
-		$client = new Client($settings);
-		$certPath = $this->getCertPath();
-		$client->setThrowExceptions(true);
-
-		if ($certPath !== '' && strpos($url, 'http://') !== 0) {
-			$client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-
-		return $client;
-	}
-
-	protected function requestSyncReport(string $url, string $userName, string $addressBookUrl, string $sharedSecret, ?string $syncToken): array {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-
-		$body = $this->buildSyncCollectionRequestBody($syncToken);
-
-		$response = $client->request('REPORT', $addressBookUrl, $body, [
-			'Content-Type' => 'application/xml'
-		]);
-
-		return $this->parseMultiStatus($response['body']);
-	}
-
-	protected function download(string $url, string $userName, string $sharedSecret, string $resourcePath): array {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-		return $client->request('GET', $resourcePath);
-	}
-
-	private function buildSyncCollectionRequestBody(?string $syncToken): string {
-		$dom = new \DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$root = $dom->createElementNS('DAV:', 'd:sync-collection');
-		$sync = $dom->createElement('d:sync-token', $syncToken);
-		$prop = $dom->createElement('d:prop');
-		$cont = $dom->createElement('d:getcontenttype');
-		$etag = $dom->createElement('d:getetag');
-
-		$prop->appendChild($cont);
-		$prop->appendChild($etag);
-		$root->appendChild($sync);
-		$root->appendChild($prop);
-		$dom->appendChild($root);
-		return $dom->saveXML();
-	}
-
-	/**
-	 * @param string $body
-	 * @return array
-	 * @throws \Sabre\Xml\ParseException
-	 */
-	private function parseMultiStatus($body) {
-		$xml = new Service();
-
-		/** @var MultiStatus $multiStatus */
-		$multiStatus = $xml->expect('{DAV:}multistatus', $body);
-
-		$result = [];
-		foreach ($multiStatus->getResponses() as $response) {
-			$result[$response->getHref()] = $response->getResponseProperties();
-		}
-
-		return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
-	}
-
-	/**
-	 * @param IUser $user
-	 */
-	public function updateUser(IUser $user) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$addressBookId = $systemAddressBook['id'];
-
-		$cardId = self::getCardUri($user);
-		if ($user->isEnabled()) {
-			$card = $this->backend->getCard($addressBookId, $cardId);
-			if ($card === false) {
-				$vCard = $this->converter->createCardFromUser($user);
-				if ($vCard !== null) {
-					$this->backend->createCard($addressBookId, $cardId, $vCard->serialize(), false);
-				}
-			} else {
-				$vCard = $this->converter->createCardFromUser($user);
-				if (is_null($vCard)) {
-					$this->backend->deleteCard($addressBookId, $cardId);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			}
-		} else {
-			$this->backend->deleteCard($addressBookId, $cardId);
-		}
-	}
-
-	/**
-	 * @param IUser|string $userOrCardId
-	 */
-	public function deleteUser($userOrCardId) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		if ($userOrCardId instanceof IUser) {
-			$userOrCardId = self::getCardUri($userOrCardId);
-		}
-		$this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
-	}
-
-	/**
-	 * @return array|null
-	 */
-	public function getLocalSystemAddressBook() {
-		if (is_null($this->localSystemAddressBook)) {
-			$systemPrincipal = "principals/system/system";
-			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
-			]);
-		}
-
-		return $this->localSystemAddressBook;
-	}
-
-	public function syncInstance(\Closure $progressCallback = null) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
-			$this->updateUser($user);
-			if (!is_null($progressCallback)) {
-				$progressCallback();
-			}
-		});
-
-		// remove no longer existing
-		$allCards = $this->backend->getCards($systemAddressBook['id']);
-		foreach ($allCards as $card) {
-			$vCard = Reader::read($card['carddata']);
-			$uid = $vCard->UID->getValue();
-			// load backend and see if user exists
-			if (!$this->userManager->userExists($uid)) {
-				$this->deleteUser($card['uri']);
-			}
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string
-	 */
-	public static function getCardUri(IUser $user): string {
-		return $user->getBackendClassName() . ':' . $user->getUID() . '.vcf';
-	}
+    private CardDavBackend $backend;
+    private IUserManager $userManager;
+    private LoggerInterface $logger;
+    private ?array $localSystemAddressBook = null;
+    private Converter $converter;
+    protected string $certPath;
+
+    public function __construct(CardDavBackend $backend,
+                                IUserManager $userManager,
+                                LoggerInterface $logger,
+                                Converter $converter) {
+        $this->backend = $backend;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->converter = $converter;
+        $this->certPath = '';
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function syncRemoteAddressBook(string $url, string $userName, string $addressBookUrl, string $sharedSecret, ?string $syncToken, string $targetBookHash, string $targetPrincipal, array $targetProperties): string {
+        // 1. create addressbook
+        $book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookHash, $targetProperties);
+        $addressBookId = $book['id'];
+
+        // 2. query changes
+        try {
+            $response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
+        } catch (ClientHttpException $ex) {
+            if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+                // remote server revoked access to the address book, remove it
+                $this->backend->deleteAddressBook($addressBookId);
+                $this->logger->error('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+                throw $ex;
+            }
+            $this->logger->error('Client exception:', ['app' => 'dav', 'exception' => $ex]);
+            throw $ex;
+        }
+
+        // 3. apply changes
+        // TODO: use multi-get for download
+        foreach ($response['response'] as $resource => $status) {
+            $cardUri = basename($resource);
+            if (isset($status[200])) {
+                $vCard = $this->download($url, $userName, $sharedSecret, $resource);
+                $existingCard = $this->backend->getCard($addressBookId, $cardUri);
+                if ($existingCard === false) {
+                    $this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
+                }
+            } else {
+                $this->backend->deleteCard($addressBookId, $cardUri);
+            }
+        }
+
+        return $response['token'];
+    }
+
+    /**
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureSystemAddressBookExists(string $principal, string $uri, array $properties): ?array {
+        $book = $this->backend->getAddressBooksByUri($principal, $uri);
+        if (!is_null($book)) {
+            return $book;
+        }
+        // FIXME This might break in clustered DB setup
+        $this->backend->createAddressBook($principal, $uri, $properties);
+
+        return $this->backend->getAddressBooksByUri($principal, $uri);
+    }
+
+    /**
+     * Check if there is a valid certPath we should use
+     */
+    protected function getCertPath(): string {
+
+        // we already have a valid certPath
+        if ($this->certPath !== '') {
+            return $this->certPath;
+        }
+
+        $certManager = \OC::$server->getCertificateManager();
+        $certPath = $certManager->getAbsoluteBundlePath();
+        if (file_exists($certPath)) {
+            $this->certPath = $certPath;
+        }
+
+        return $this->certPath;
+    }
+
+    protected function getClient(string $url, string $userName, string $sharedSecret): Client {
+        $settings = [
+            'baseUri' => $url . '/',
+            'userName' => $userName,
+            'password' => $sharedSecret,
+        ];
+        $client = new Client($settings);
+        $certPath = $this->getCertPath();
+        $client->setThrowExceptions(true);
+
+        if ($certPath !== '' && strpos($url, 'http://') !== 0) {
+            $client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+
+        return $client;
+    }
+
+    protected function requestSyncReport(string $url, string $userName, string $addressBookUrl, string $sharedSecret, ?string $syncToken): array {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+
+        $body = $this->buildSyncCollectionRequestBody($syncToken);
+
+        $response = $client->request('REPORT', $addressBookUrl, $body, [
+            'Content-Type' => 'application/xml'
+        ]);
+
+        return $this->parseMultiStatus($response['body']);
+    }
+
+    protected function download(string $url, string $userName, string $sharedSecret, string $resourcePath): array {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+        return $client->request('GET', $resourcePath);
+    }
+
+    private function buildSyncCollectionRequestBody(?string $syncToken): string {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElementNS('DAV:', 'd:sync-collection');
+        $sync = $dom->createElement('d:sync-token', $syncToken);
+        $prop = $dom->createElement('d:prop');
+        $cont = $dom->createElement('d:getcontenttype');
+        $etag = $dom->createElement('d:getetag');
+
+        $prop->appendChild($cont);
+        $prop->appendChild($etag);
+        $root->appendChild($sync);
+        $root->appendChild($prop);
+        $dom->appendChild($root);
+        return $dom->saveXML();
+    }
+
+    /**
+     * @param string $body
+     * @return array
+     * @throws \Sabre\Xml\ParseException
+     */
+    private function parseMultiStatus($body) {
+        $xml = new Service();
+
+        /** @var MultiStatus $multiStatus */
+        $multiStatus = $xml->expect('{DAV:}multistatus', $body);
+
+        $result = [];
+        foreach ($multiStatus->getResponses() as $response) {
+            $result[$response->getHref()] = $response->getResponseProperties();
+        }
+
+        return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
+    }
+
+    /**
+     * @param IUser $user
+     */
+    public function updateUser(IUser $user) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $addressBookId = $systemAddressBook['id'];
+
+        $cardId = self::getCardUri($user);
+        if ($user->isEnabled()) {
+            $card = $this->backend->getCard($addressBookId, $cardId);
+            if ($card === false) {
+                $vCard = $this->converter->createCardFromUser($user);
+                if ($vCard !== null) {
+                    $this->backend->createCard($addressBookId, $cardId, $vCard->serialize(), false);
+                }
+            } else {
+                $vCard = $this->converter->createCardFromUser($user);
+                if (is_null($vCard)) {
+                    $this->backend->deleteCard($addressBookId, $cardId);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            }
+        } else {
+            $this->backend->deleteCard($addressBookId, $cardId);
+        }
+    }
+
+    /**
+     * @param IUser|string $userOrCardId
+     */
+    public function deleteUser($userOrCardId) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        if ($userOrCardId instanceof IUser) {
+            $userOrCardId = self::getCardUri($userOrCardId);
+        }
+        $this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getLocalSystemAddressBook() {
+        if (is_null($this->localSystemAddressBook)) {
+            $systemPrincipal = "principals/system/system";
+            $this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+            ]);
+        }
+
+        return $this->localSystemAddressBook;
+    }
+
+    public function syncInstance(\Closure $progressCallback = null) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
+            $this->updateUser($user);
+            if (!is_null($progressCallback)) {
+                $progressCallback();
+            }
+        });
+
+        // remove no longer existing
+        $allCards = $this->backend->getCards($systemAddressBook['id']);
+        foreach ($allCards as $card) {
+            $vCard = Reader::read($card['carddata']);
+            $uid = $vCard->UID->getValue();
+            // load backend and see if user exists
+            if (!$this->userManager->userExists($uid)) {
+                $this->deleteUser($card['uri']);
+            }
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return string
+     */
+    public static function getCardUri(IUser $user): string {
+        return $user->getBackendClassName() . ':' . $user->getUID() . '.vcf';
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
 				// remote server revoked access to the address book, remove it
 				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->error('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+				$this->logger->error('Authorization failed, remove address book: '.$url, ['app' => 'dav']);
 				throw $ex;
 			}
 			$this->logger->error('Client exception:', ['app' => 'dav', 'exception' => $ex]);
@@ -136,7 +136,7 @@ 
 
 	protected function getClient(string $url, string $userName, string $sharedSecret): Client {
 		$settings = [
-			'baseUri' => $url . '/',
+			'baseUri' => $url.'/',
 			'userName' => $userName,
 			'password' => $sharedSecret,
 		];
@@ -250,7 +250,7 @@ 
 		if (is_null($this->localSystemAddressBook)) {
 			$systemPrincipal = "principals/system/system";
 			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description' => 'System addressbook which holds all users of this instance'
 			]);
 		}
 
@@ -259,7 +259,7 @@ 
 
 	public function syncInstance(\Closure $progressCallback = null) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
+		$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
 			$this->updateUser($user);
 			if (!is_null($progressCallback)) {
 				$progressCallback();
@@ -283,6 +283,6 @@ 
 	 * @return string
 	 */
 	public static function getCardUri(IUser $user): string {
-		return $user->getBackendClassName() . ':' . $user->getUID() . '.vcf';
+		return $user->getBackendClassName().':'.$user->getUID().'.vcf';
 	}
 }

apps/dav/lib/CardDAV/AddressBookRoot.php

Indentation +43 added lines, -43 removed lines

@@ -30,51 +30,51 @@
 
 class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
 
-	/** @var PluginManager */
-	private $pluginManager;
-	private ?IUser $user;
-	private ?IGroupManager $groupManager;
+    /** @var PluginManager */
+    private $pluginManager;
+    private ?IUser $user;
+    private ?IGroupManager $groupManager;
 
-	/**
-	 * @param \Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend
-	 * @param \Sabre\CardDAV\Backend\BackendInterface $carddavBackend
-	 * @param string $principalPrefix
-	 */
-	public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend,
-								\Sabre\CardDAV\Backend\BackendInterface $carddavBackend,
-								PluginManager $pluginManager,
-								?IUser $user,
-								?IGroupManager $groupManager,
-								string $principalPrefix = 'principals') {
-		parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
-		$this->pluginManager = $pluginManager;
-		$this->user = $user;
-		$this->groupManager = $groupManager;
-	}
+    /**
+     * @param \Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend
+     * @param \Sabre\CardDAV\Backend\BackendInterface $carddavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend,
+                                \Sabre\CardDAV\Backend\BackendInterface $carddavBackend,
+                                PluginManager $pluginManager,
+                                ?IUser $user,
+                                ?IGroupManager $groupManager,
+                                string $principalPrefix = 'principals') {
+        parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
+        $this->pluginManager = $pluginManager;
+        $this->user = $user;
+        $this->groupManager = $groupManager;
+    }
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principal
-	 *
-	 * @return \Sabre\DAV\INode
-	 */
-	public function getChildForPrincipal(array $principal) {
-		return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->pluginManager, $this->user, $this->groupManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     *
+     * @return \Sabre\DAV\INode
+     */
+    public function getChildForPrincipal(array $principal) {
+        return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->pluginManager, $this->user, $this->groupManager);
+    }
 
-	public function getName() {
-		if ($this->principalPrefix === 'principals') {
-			return parent::getName();
-		}
-		// Grabbing all the components of the principal path.
-		$parts = explode('/', $this->principalPrefix);
+    public function getName() {
+        if ($this->principalPrefix === 'principals') {
+            return parent::getName();
+        }
+        // Grabbing all the components of the principal path.
+        $parts = explode('/', $this->principalPrefix);
 
-		// We are only interested in the second part.
-		return $parts[1];
-	}
+        // We are only interested in the second part.
+        return $parts[1];
+    }
 }

apps/dav/lib/CardDAV/SystemAddressbook.php

Indentation +226 added lines, -226 removed lines

@@ -48,252 +48,252 @@
 use function array_unique;
 
 class SystemAddressbook extends AddressBook {
-	public const URI_SHARED = 'z-server-generated--system';
-	/** @var IConfig */
-	private $config;
-	private IUserSession $userSession;
-	private ?TrustedServers $trustedServers;
-	private ?IRequest $request;
-	private ?IGroupManager $groupManager;
+    public const URI_SHARED = 'z-server-generated--system';
+    /** @var IConfig */
+    private $config;
+    private IUserSession $userSession;
+    private ?TrustedServers $trustedServers;
+    private ?IRequest $request;
+    private ?IGroupManager $groupManager;
 
-	public function __construct(BackendInterface $carddavBackend,
-		array $addressBookInfo,
-		IL10N $l10n,
-		IConfig $config,
-		IUserSession $userSession,
-		?IRequest $request = null,
-		?TrustedServers $trustedServers = null,
-		?IGroupManager $groupManager) {
-		parent::__construct($carddavBackend, $addressBookInfo, $l10n);
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->request = $request;
-		$this->trustedServers = $trustedServers;
-		$this->groupManager = $groupManager;
+    public function __construct(BackendInterface $carddavBackend,
+        array $addressBookInfo,
+        IL10N $l10n,
+        IConfig $config,
+        IUserSession $userSession,
+        ?IRequest $request = null,
+        ?TrustedServers $trustedServers = null,
+        ?IGroupManager $groupManager) {
+        parent::__construct($carddavBackend, $addressBookInfo, $l10n);
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->request = $request;
+        $this->trustedServers = $trustedServers;
+        $this->groupManager = $groupManager;
 
-		$this->addressBookInfo['{DAV:}displayname'] = $l10n->t('Accounts');
-		$this->addressBookInfo['{' . Plugin::NS_CARDDAV . '}addressbook-description'] = $l10n->t('System address book which holds all accounts');
-	}
+        $this->addressBookInfo['{DAV:}displayname'] = $l10n->t('Accounts');
+        $this->addressBookInfo['{' . Plugin::NS_CARDDAV . '}addressbook-description'] = $l10n->t('System address book which holds all accounts');
+    }
 
-	/**
-	 * No checkbox checked -> Show only the same user
-	 * 'Allow username autocompletion in share dialog' -> show everyone
-	 * 'Allow username autocompletion in share dialog' + 'Allow username autocompletion to users within the same groups' -> show only users in intersecting groups
-	 * 'Allow username autocompletion in share dialog' + 'Allow username autocompletion to users based on phone number integration' -> show only the same user
-	 * 'Allow username autocompletion in share dialog' + 'Allow username autocompletion to users within the same groups' + 'Allow username autocompletion to users based on phone number integration' -> show only users in intersecting groups
-	 */
-	public function getChildren() {
-		$shareEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$shareEnumerationGroup = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$shareEnumerationPhone = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			// Should never happen because we don't allow anonymous access
-			return [];
-		}
-		if (!$shareEnumeration || !$shareEnumerationGroup && $shareEnumerationPhone) {
-			$name = SyncService::getCardUri($user);
-			try {
-				return [parent::getChild($name)];
-			} catch (NotFound $e) {
-				return [];
-			}
-		}
-		if ($shareEnumerationGroup) {
-			if ($this->groupManager === null) {
-				// Group manager is not available, so we can't determine which data is safe
-				return [];
-			}
-			$groups = $this->groupManager->getUserGroups($user);
-			$names = [];
-			foreach ($groups as $group) {
-				$users = $group->getUsers();
-				foreach ($users as $groupUser) {
-					if ($groupUser->getBackendClassName() === 'Guests') {
-						continue;
-					}
-					$names[] = SyncService::getCardUri($groupUser);
-				}
-			}
-			return parent::getMultipleChildren(array_unique($names));
-		}
+    /**
+     * No checkbox checked -> Show only the same user
+     * 'Allow username autocompletion in share dialog' -> show everyone
+     * 'Allow username autocompletion in share dialog' + 'Allow username autocompletion to users within the same groups' -> show only users in intersecting groups
+     * 'Allow username autocompletion in share dialog' + 'Allow username autocompletion to users based on phone number integration' -> show only the same user
+     * 'Allow username autocompletion in share dialog' + 'Allow username autocompletion to users within the same groups' + 'Allow username autocompletion to users based on phone number integration' -> show only users in intersecting groups
+     */
+    public function getChildren() {
+        $shareEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $shareEnumerationGroup = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $shareEnumerationPhone = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            // Should never happen because we don't allow anonymous access
+            return [];
+        }
+        if (!$shareEnumeration || !$shareEnumerationGroup && $shareEnumerationPhone) {
+            $name = SyncService::getCardUri($user);
+            try {
+                return [parent::getChild($name)];
+            } catch (NotFound $e) {
+                return [];
+            }
+        }
+        if ($shareEnumerationGroup) {
+            if ($this->groupManager === null) {
+                // Group manager is not available, so we can't determine which data is safe
+                return [];
+            }
+            $groups = $this->groupManager->getUserGroups($user);
+            $names = [];
+            foreach ($groups as $group) {
+                $users = $group->getUsers();
+                foreach ($users as $groupUser) {
+                    if ($groupUser->getBackendClassName() === 'Guests') {
+                        continue;
+                    }
+                    $names[] = SyncService::getCardUri($groupUser);
+                }
+            }
+            return parent::getMultipleChildren(array_unique($names));
+        }
 
-		$children = parent::getChildren();
-		return array_filter($children, function (Card $child) {
-			// check only for URIs that begin with Guests:
-			return strpos($child->getName(), 'Guests:') !== 0;
-		});
-	}
+        $children = parent::getChildren();
+        return array_filter($children, function (Card $child) {
+            // check only for URIs that begin with Guests:
+            return strpos($child->getName(), 'Guests:') !== 0;
+        });
+    }
 
-	/**
-	 * @param array $paths
-	 * @return Card[]
-	 * @throws NotFound
-	 */
-	public function getMultipleChildren($paths): array {
-		if (!$this->isFederation()) {
-			return parent::getMultipleChildren($paths);
-		}
+    /**
+     * @param array $paths
+     * @return Card[]
+     * @throws NotFound
+     */
+    public function getMultipleChildren($paths): array {
+        if (!$this->isFederation()) {
+            return parent::getMultipleChildren($paths);
+        }
 
-		$objs = $this->carddavBackend->getMultipleCards($this->addressBookInfo['id'], $paths);
-		$children = [];
-		/** @var array $obj */
-		foreach ($objs as $obj) {
-			if (empty($obj)) {
-				continue;
-			}
-			$carddata = $this->extractCarddata($obj);
-			if (empty($carddata)) {
-				continue;
-			} else {
-				$obj['carddata'] = $carddata;
-			}
-			$children[] = new Card($this->carddavBackend, $this->addressBookInfo, $obj);
-		}
-		return $children;
-	}
+        $objs = $this->carddavBackend->getMultipleCards($this->addressBookInfo['id'], $paths);
+        $children = [];
+        /** @var array $obj */
+        foreach ($objs as $obj) {
+            if (empty($obj)) {
+                continue;
+            }
+            $carddata = $this->extractCarddata($obj);
+            if (empty($carddata)) {
+                continue;
+            } else {
+                $obj['carddata'] = $carddata;
+            }
+            $children[] = new Card($this->carddavBackend, $this->addressBookInfo, $obj);
+        }
+        return $children;
+    }
 
-	/**
-	 * @param string $name
-	 * @return Card
-	 * @throws NotFound
-	 * @throws Forbidden
-	 */
-	public function getChild($name): Card {
-		if (!$this->isFederation()) {
-			return parent::getChild($name);
-		}
+    /**
+     * @param string $name
+     * @return Card
+     * @throws NotFound
+     * @throws Forbidden
+     */
+    public function getChild($name): Card {
+        if (!$this->isFederation()) {
+            return parent::getChild($name);
+        }
 
-		$obj = $this->carddavBackend->getCard($this->addressBookInfo['id'], $name);
-		if (!$obj) {
-			throw new NotFound('Card not found');
-		}
-		$carddata = $this->extractCarddata($obj);
-		if (empty($carddata)) {
-			throw new Forbidden();
-		} else {
-			$obj['carddata'] = $carddata;
-		}
-		return new Card($this->carddavBackend, $this->addressBookInfo, $obj);
-	}
+        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'], $name);
+        if (!$obj) {
+            throw new NotFound('Card not found');
+        }
+        $carddata = $this->extractCarddata($obj);
+        if (empty($carddata)) {
+            throw new Forbidden();
+        } else {
+            $obj['carddata'] = $carddata;
+        }
+        return new Card($this->carddavBackend, $this->addressBookInfo, $obj);
+    }
 
-	/**
-	 * @throws UnsupportedLimitOnInitialSyncException
-	 */
-	public function getChanges($syncToken, $syncLevel, $limit = null) {
-		if (!$syncToken && $limit) {
-			throw new UnsupportedLimitOnInitialSyncException();
-		}
+    /**
+     * @throws UnsupportedLimitOnInitialSyncException
+     */
+    public function getChanges($syncToken, $syncLevel, $limit = null) {
+        if (!$syncToken && $limit) {
+            throw new UnsupportedLimitOnInitialSyncException();
+        }
 
-		if (!$this->carddavBackend instanceof SyncSupport) {
-			return null;
-		}
+        if (!$this->carddavBackend instanceof SyncSupport) {
+            return null;
+        }
 
-		if (!$this->isFederation()) {
-			return parent::getChanges($syncToken, $syncLevel, $limit);
-		}
+        if (!$this->isFederation()) {
+            return parent::getChanges($syncToken, $syncLevel, $limit);
+        }
 
-		$changed = $this->carddavBackend->getChangesForAddressBook(
-			$this->addressBookInfo['id'],
-			$syncToken,
-			$syncLevel,
-			$limit
-		);
+        $changed = $this->carddavBackend->getChangesForAddressBook(
+            $this->addressBookInfo['id'],
+            $syncToken,
+            $syncLevel,
+            $limit
+        );
 
-		if (empty($changed)) {
-			return $changed;
-		}
+        if (empty($changed)) {
+            return $changed;
+        }
 
-		$added = $modified = $deleted = [];
-		foreach ($changed['added'] as $uri) {
-			try {
-				$this->getChild($uri);
-				$added[] = $uri;
-			} catch (NotFound | Forbidden $e) {
-				$deleted[] = $uri;
-			}
-		}
-		foreach ($changed['modified'] as $uri) {
-			try {
-				$this->getChild($uri);
-				$modified[] = $uri;
-			} catch (NotFound | Forbidden $e) {
-				$deleted[] = $uri;
-			}
-		}
-		$changed['added'] = $added;
-		$changed['modified'] = $modified;
-		$changed['deleted'] = $deleted;
-		return $changed;
-	}
+        $added = $modified = $deleted = [];
+        foreach ($changed['added'] as $uri) {
+            try {
+                $this->getChild($uri);
+                $added[] = $uri;
+            } catch (NotFound | Forbidden $e) {
+                $deleted[] = $uri;
+            }
+        }
+        foreach ($changed['modified'] as $uri) {
+            try {
+                $this->getChild($uri);
+                $modified[] = $uri;
+            } catch (NotFound | Forbidden $e) {
+                $deleted[] = $uri;
+            }
+        }
+        $changed['added'] = $added;
+        $changed['modified'] = $modified;
+        $changed['deleted'] = $deleted;
+        return $changed;
+    }
 
-	private function isFederation(): bool {
-		if ($this->trustedServers === null || $this->request === null) {
-			return false;
-		}
+    private function isFederation(): bool {
+        if ($this->trustedServers === null || $this->request === null) {
+            return false;
+        }
 
-		/** @psalm-suppress NoInterfaceProperties */
-		if ($this->request->server['PHP_AUTH_USER'] !== 'system') {
-			return false;
-		}
+        /** @psalm-suppress NoInterfaceProperties */
+        if ($this->request->server['PHP_AUTH_USER'] !== 'system') {
+            return false;
+        }
 
-		/** @psalm-suppress NoInterfaceProperties */
-		$sharedSecret = $this->request->server['PHP_AUTH_PW'];
-		if ($sharedSecret === null) {
-			return false;
-		}
+        /** @psalm-suppress NoInterfaceProperties */
+        $sharedSecret = $this->request->server['PHP_AUTH_PW'];
+        if ($sharedSecret === null) {
+            return false;
+        }
 
-		$servers = $this->trustedServers->getServers();
-		$trusted = array_filter($servers, function ($trustedServer) use ($sharedSecret) {
-			return $trustedServer['shared_secret'] === $sharedSecret;
-		});
-		// Authentication is fine, but it's not for a federated share
-		if (empty($trusted)) {
-			return false;
-		}
+        $servers = $this->trustedServers->getServers();
+        $trusted = array_filter($servers, function ($trustedServer) use ($sharedSecret) {
+            return $trustedServer['shared_secret'] === $sharedSecret;
+        });
+        // Authentication is fine, but it's not for a federated share
+        if (empty($trusted)) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * If the validation doesn't work the card is "not found" so we
-	 * return empty carddata even if the carddata might exist in the local backend.
-	 * This can happen when a user sets the required properties
-	 * FN, N to a local scope only but the request is from
-	 * a federated share.
-	 *
-	 * @see https://github.com/nextcloud/server/issues/38042
-	 *
-	 * @param array $obj
-	 * @return string|null
-	 */
-	private function extractCarddata(array $obj): ?string {
-		$obj['acl'] = $this->getChildACL();
-		$cardData = $obj['carddata'];
-		/** @var VCard $vCard */
-		$vCard = Reader::read($cardData);
-		foreach ($vCard->children() as $child) {
-			$scope = $child->offsetGet('X-NC-SCOPE');
-			if ($scope !== null && $scope->getValue() === IAccountManager::SCOPE_LOCAL) {
-				$vCard->remove($child);
-			}
-		}
-		$messages = $vCard->validate();
-		if (!empty($messages)) {
-			return null;
-		}
+    /**
+     * If the validation doesn't work the card is "not found" so we
+     * return empty carddata even if the carddata might exist in the local backend.
+     * This can happen when a user sets the required properties
+     * FN, N to a local scope only but the request is from
+     * a federated share.
+     *
+     * @see https://github.com/nextcloud/server/issues/38042
+     *
+     * @param array $obj
+     * @return string|null
+     */
+    private function extractCarddata(array $obj): ?string {
+        $obj['acl'] = $this->getChildACL();
+        $cardData = $obj['carddata'];
+        /** @var VCard $vCard */
+        $vCard = Reader::read($cardData);
+        foreach ($vCard->children() as $child) {
+            $scope = $child->offsetGet('X-NC-SCOPE');
+            if ($scope !== null && $scope->getValue() === IAccountManager::SCOPE_LOCAL) {
+                $vCard->remove($child);
+            }
+        }
+        $messages = $vCard->validate();
+        if (!empty($messages)) {
+            return null;
+        }
 
-		return $vCard->serialize();
-	}
+        return $vCard->serialize();
+    }
 
-	/**
-	 * @return mixed
-	 * @throws Forbidden
-	 */
-	public function delete() {
-		if ($this->isFederation()) {
-			parent::delete();
-		}
-		throw new Forbidden();
-	}
+    /**
+     * @return mixed
+     * @throws Forbidden
+     */
+    public function delete() {
+        if ($this->isFederation()) {
+            parent::delete();
+        }
+        throw new Forbidden();
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 		$this->groupManager = $groupManager;
 
 		$this->addressBookInfo['{DAV:}displayname'] = $l10n->t('Accounts');
-		$this->addressBookInfo['{' . Plugin::NS_CARDDAV . '}addressbook-description'] = $l10n->t('System address book which holds all accounts');
+		$this->addressBookInfo['{'.Plugin::NS_CARDDAV.'}addressbook-description'] = $l10n->t('System address book which holds all accounts');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 		}
 
 		$children = parent::getChildren();
-		return array_filter($children, function (Card $child) {
+		return array_filter($children, function(Card $child) {
 			// check only for URIs that begin with Guests:
 			return strpos($child->getName(), 'Guests:') !== 0;
 		});
@@ -244,7 +244,7 @@ 
 		}
 
 		$servers = $this->trustedServers->getServers();
-		$trusted = array_filter($servers, function ($trustedServer) use ($sharedSecret) {
+		$trusted = array_filter($servers, function($trustedServer) use ($sharedSecret) {
 			return $trustedServer['shared_secret'] === $sharedSecret;
 		});
 		// Authentication is fine, but it's not for a federated share

apps/settings/templates/settings/admin/sharing.php

Indentation +41 added lines, -41 removed lines

@@ -40,22 +40,22 @@ 
 		<p id="enable">
 			<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
 				   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
 		</p>
 
 		<p id="internalShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 } ?>">
 			<input type="checkbox" name="shareapi_default_internal_expire_date" id="shareapiDefaultInternalExpireDate" class="checkbox"
 				   value="1" <?php if ($_['shareDefaultInternalExpireDateSet'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares'));?></label><br/>
 		</p>
 		<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<?php p($l->t('Expire after') . ' '); ?>
 			<input type="text" name='shareapi_internal_expire_after_n_days' id="shareapiInternalExpireAfterNDays" placeholder="<?php p('7')?>"
@@ -63,22 +63,22 @@ 
 			<?php p($l->t('day(s)')); ?>
 			<input type="checkbox" name="shareapi_enforce_internal_expire_date" id="shareapiInternalEnforceExpireDate" class="checkbox"
 				   value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
 		</p>
 
 		<p id="remoteShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 } ?>">
 			<input type="checkbox" name="shareapi_default_remote_expire_date" id="shareapiDefaultRemoteExpireDate" class="checkbox"
 				   value="1" <?php if ($_['shareDefaultRemoteExpireDateSet'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiDefaultRemoteExpireDate"><?php p($l->t('Set default expiration date for shares to other servers'));?></label><br/>
 		</p>
 		<p id="setDefaultRemoteExpireDate" class="double-indent <?php if ($_['shareDefaultRemoteExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<?php p($l->t('Expire after'). ' '); ?>
 			<input type="text" name='shareapi_remote_expire_after_n_days' id="shareapiRemoteExpireAfterNDays" placeholder="<?php p('7')?>"
@@ -86,37 +86,37 @@ 
 			<?php p($l->t('day(s)')); ?>
 			<input type="checkbox" name="shareapi_enforce_remote_expire_date" id="shareapiRemoteEnforceExpireDate" class="checkbox"
 				   value="1" <?php if ($_['shareRemoteEnforceExpireDate'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiRemoteEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
 		</p>
 
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox"
 				   value="1" <?php if ($_['allowLinks'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="allowLinks"><?php p($l->t('Allow users to share via link and emails'));?></label><br/>
 		</p>
 
 		<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 } ?>">
 			<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
 				   value="1" <?php if ($_['allowPublicUpload'] == 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
 			<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
 				   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
 			<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
 				   value="1" <?php if ($_['enforceLinkPassword']) {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
 
@@ -132,13 +132,13 @@ 
 
 			<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
 				   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
 
 		</p>
 		<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<?php p($l->t('Expire after'). ' '); ?>
 			<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
@@ -146,56 +146,56 @@ 
 			<?php p($l->t('day(s)')); ?>
 			<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
 				   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 		<p class="indent">
 			<?php p($l->t('Exclude groups from creating link shares:'));?>
 		</p>
 		<p id="selectLinksExcludedGroups" class="indent <?php if ($_['allowLinks'] === 'no') {
-	p('hidden');
+    p('hidden');
 } ?>">
 			<input name="shareapi_allow_links_exclude_groups" type="hidden" id="linksExcludedGroups" value="<?php p($_['allowLinksExcludeGroups']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
 		</p>
 			<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox"
 				   value="1" <?php if ($_['allowResharing'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox"
 				   value="1" <?php if ($_['allowGroupSharing'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
 				   value="1" <?php if ($_['onlyShareWithGroupMembers']) {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox"
 				   value="1" <?php if ($_['shareExcludeGroups']) {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
 		</p>
 		<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 } ?>">
 			<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
 			<br />
@@ -203,45 +203,45 @@ 
 		</p>
 
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox"
 				<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog and allow access to the system address book'));?></label><br />
 		</p>
 
 		<p id="shareapi_restrict_user_enumeration_to_group_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_restrict_user_enumeration_to_group" value="1" id="shareapi_restrict_user_enumeration_to_group" class="checkbox"
 				<?php if ($_['restrictUserEnumerationToGroup'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapi_restrict_user_enumeration_to_group"><?php p($l->t('Allow username autocompletion to users within the same groups and limit system address books to users in the same groups'));?></label><br />
 		</p>
 
 		<p id="shareapi_restrict_user_enumeration_to_phone_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_restrict_user_enumeration_to_phone" value="1" id="shareapi_restrict_user_enumeration_to_phone" class="checkbox"
 				<?php if ($_['restrictUserEnumerationToPhone'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phone number integration'));?></label><br />
 		</p>
 		<p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<em><?php p($l->t('If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.'));?></em><br />
 		</p>
 		<p id="shareapi_restrict_user_enumeration_full_match_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 }?>">
 			<input type="checkbox" name="shareapi_restrict_user_enumeration_full_match" value="1" id="shareapi_restrict_user_enumeration_full_match" class="checkbox"
 					<?php if ($_['restrictUserEnumerationFullMatch'] === 'yes') {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="shareapi_restrict_user_enumeration_full_match"><?php p($l->t('Allow autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)'));?></label><br />
 		</p>
@@ -249,13 +249,13 @@ 
 		<p>
 			<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"
 				<?php if ($_['publicShareDisclaimerText'] !== null) {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page (only shown when the file list is hidden)'));?></label>
 			<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
 			<br/>
 			<textarea placeholder="<?php p($l->t('This text will be shown on the public link upload page when the file list is hidden.')) ?>" id="publicShareDisclaimerText" <?php if ($_['publicShareDisclaimerText'] === null) {
-	print_unescaped('class="hidden"');
+    print_unescaped('class="hidden"');
 } ?>><?php p($_['publicShareDisclaimerText']) ?></textarea>
 		</p>
 
@@ -263,12 +263,12 @@ 
 		<input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
 			   value="<?php p($_['shareApiDefaultPermissions']) ?>" />
 		<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
-	p('hidden');
+    p('hidden');
 } ?>">
 			<?php foreach ($_['shareApiDefaultPermissionsCheckboxes'] as $perm): ?>
 				<input type="checkbox" name="shareapi_default_permission_<?php p($perm['id']) ?>" id="shareapi_default_permission_<?php p($perm['id']) ?>"
 					   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 				<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label>
 			<?php endforeach ?>

Spacing +31 added lines, -31 removed lines

@@ -28,21 +28,21 @@ 
 ?>
 
 <div class="section loading" id="shareAPI">
-	<h2><?php p($l->t('Sharing'));?></h2>
+	<h2><?php p($l->t('Sharing')); ?></h2>
 	<?php if ($_['sharingAppEnabled'] === false) { ?>
 		<p class="warning"><?php p($l->t('You need to enable the File sharing App.')); ?></p>
 	<?php } else { ?>
 		<a target="_blank" rel="noreferrer noopener" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
 	<div>
-			<p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
+			<p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.')); ?></p>
 		<p id="enable">
 			<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
 				   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
+			<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API')); ?></label><br/>
 		</p>
 
 		<p id="internalShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
@@ -52,12 +52,12 @@ 
 				   value="1" <?php if ($_['shareDefaultInternalExpireDateSet'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares'));?></label><br/>
+			<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares')); ?></label><br/>
 		</p>
 		<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
 	p('hidden');
 }?>">
-			<?php p($l->t('Expire after') . ' '); ?>
+			<?php p($l->t('Expire after').' '); ?>
 			<input type="text" name='shareapi_internal_expire_after_n_days' id="shareapiInternalExpireAfterNDays" placeholder="<?php p('7')?>"
 				   value='<?php p($_['shareInternalExpireAfterNDays']) ?>' />
 			<?php p($l->t('day(s)')); ?>
@@ -65,7 +65,7 @@ 
 				   value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+			<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
 		</p>
 
 		<p id="remoteShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
@@ -75,12 +75,12 @@ 
 				   value="1" <?php if ($_['shareDefaultRemoteExpireDateSet'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiDefaultRemoteExpireDate"><?php p($l->t('Set default expiration date for shares to other servers'));?></label><br/>
+			<label for="shareapiDefaultRemoteExpireDate"><?php p($l->t('Set default expiration date for shares to other servers')); ?></label><br/>
 		</p>
 		<p id="setDefaultRemoteExpireDate" class="double-indent <?php if ($_['shareDefaultRemoteExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
 	p('hidden');
 }?>">
-			<?php p($l->t('Expire after'). ' '); ?>
+			<?php p($l->t('Expire after').' '); ?>
 			<input type="text" name='shareapi_remote_expire_after_n_days' id="shareapiRemoteExpireAfterNDays" placeholder="<?php p('7')?>"
 				   value='<?php p($_['shareRemoteExpireAfterNDays']) ?>' />
 			<?php p($l->t('day(s)')); ?>
@@ -88,7 +88,7 @@ 
 				   value="1" <?php if ($_['shareRemoteEnforceExpireDate'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiRemoteEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+			<label for="shareapiRemoteEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
 		</p>
 
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
@@ -98,7 +98,7 @@ 
 				   value="1" <?php if ($_['allowLinks'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="allowLinks"><?php p($l->t('Allow users to share via link and emails'));?></label><br/>
+			<label for="allowLinks"><?php p($l->t('Allow users to share via link and emails')); ?></label><br/>
 		</p>
 
 		<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') {
@@ -108,22 +108,22 @@ 
 				   value="1" <?php if ($_['allowPublicUpload'] == 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+			<label for="allowPublicUpload"><?php p($l->t('Allow public uploads')); ?></label><br/>
 			<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
 				   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
+			<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password')); ?></label><br/>
 			<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
 				   value="1" <?php if ($_['enforceLinkPassword']) {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
+			<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection')); ?></label><br/>
 
 <?php if ($_['passwordExcludedGroupsFeatureEnabled']) { ?>
 			<div id="selectPasswordsExcludedGroups" class="indent <?php if (!$_['enforceLinkPassword']) { p('hidden'); } ?>">
 				<div class="indent">
-					<label for="shareapi_enforce_links_password_excluded_groups"><?php p($l->t('Exclude groups from password requirements:'));?>
+					<label for="shareapi_enforce_links_password_excluded_groups"><?php p($l->t('Exclude groups from password requirements:')); ?>
 					<br />
 					<input name="shareapi_enforce_links_password_excluded_groups" id="passwordsExcludedGroups" value="<?php p($_['passwordExcludedGroups']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
 				</div>
@@ -134,13 +134,13 @@ 
 				   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
+			<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date')); ?></label><br/>
 
 		</p>
 		<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
 	p('hidden');
 }?>">
-			<?php p($l->t('Expire after'). ' '); ?>
+			<?php p($l->t('Expire after').' '); ?>
 			<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
 				   value='<?php p($_['shareExpireAfterNDays']) ?>' />
 			<?php p($l->t('day(s)')); ?>
@@ -148,13 +148,13 @@ 
 				   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+			<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
 }?>">
 		<p class="indent">
-			<?php p($l->t('Exclude groups from creating link shares:'));?>
+			<?php p($l->t('Exclude groups from creating link shares:')); ?>
 		</p>
 		<p id="selectLinksExcludedGroups" class="indent <?php if ($_['allowLinks'] === 'no') {
 	p('hidden');
@@ -165,7 +165,7 @@ 
 				   value="1" <?php if ($_['allowResharing'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
+			<label for="allowResharing"><?php p($l->t('Allow resharing')); ?></label><br/>
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -174,7 +174,7 @@ 
 				   value="1" <?php if ($_['allowGroupSharing'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
+			<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups')); ?></label><br />
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -183,7 +183,7 @@ 
 				   value="1" <?php if ($_['onlyShareWithGroupMembers']) {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
+			<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups')); ?></label><br/>
 		</p>
 		<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -192,7 +192,7 @@ 
 				   value="1" <?php if ($_['shareExcludeGroups']) {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
+			<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing')); ?></label><br/>
 		</p>
 		<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -209,7 +209,7 @@ 
 				<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog and allow access to the system address book'));?></label><br />
+			<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog and allow access to the system address book')); ?></label><br />
 		</p>
 
 		<p id="shareapi_restrict_user_enumeration_to_group_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
@@ -219,7 +219,7 @@ 
 				<?php if ($_['restrictUserEnumerationToGroup'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapi_restrict_user_enumeration_to_group"><?php p($l->t('Allow username autocompletion to users within the same groups and limit system address books to users in the same groups'));?></label><br />
+			<label for="shareapi_restrict_user_enumeration_to_group"><?php p($l->t('Allow username autocompletion to users within the same groups and limit system address books to users in the same groups')); ?></label><br />
 		</p>
 
 		<p id="shareapi_restrict_user_enumeration_to_phone_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
@@ -229,12 +229,12 @@ 
 				<?php if ($_['restrictUserEnumerationToPhone'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phone number integration'));?></label><br />
+			<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phone number integration')); ?></label><br />
 		</p>
 		<p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
 	p('hidden');
 }?>">
-			<em><?php p($l->t('If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.'));?></em><br />
+			<em><?php p($l->t('If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.')); ?></em><br />
 		</p>
 		<p id="shareapi_restrict_user_enumeration_full_match_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -243,7 +243,7 @@ 
 					<?php if ($_['restrictUserEnumerationFullMatch'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapi_restrict_user_enumeration_full_match"><?php p($l->t('Allow autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)'));?></label><br />
+			<label for="shareapi_restrict_user_enumeration_full_match"><?php p($l->t('Allow autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)')); ?></label><br />
 		</p>
 
 		<p>
@@ -251,7 +251,7 @@ 
 				<?php if ($_['publicShareDisclaimerText'] !== null) {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page (only shown when the file list is hidden)'));?></label>
+			<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page (only shown when the file list is hidden)')); ?></label>
 			<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
 			<br/>
 			<textarea placeholder="<?php p($l->t('This text will be shown on the public link upload page when the file list is hidden.')) ?>" id="publicShareDisclaimerText" <?php if ($_['publicShareDisclaimerText'] === null) {
@@ -259,7 +259,7 @@ 
 } ?>><?php p($_['publicShareDisclaimerText']) ?></textarea>
 		</p>
 
-		<h3><?php p($l->t('Default share permissions'));?></h3>
+		<h3><?php p($l->t('Default share permissions')); ?></h3>
 		<input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
 			   value="<?php p($_['shareApiDefaultPermissions']) ?>" />
 		<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
@@ -270,7 +270,7 @@ 
 					   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) {
 	print_unescaped('checked="checked"');
 } ?> />
-				<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label>
+				<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']); ?></label>
 			<?php endforeach ?>
 		</p>
 	</div>