From cca2ade199f09c2e4c2c00c86e776dcc3b51d60f Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 20 Jan 2016 21:08:23 +0100
Subject: Adding pre oc 9.0 CardDAV endpoint for migration of old clients

---
 apps/dav/lib/carddav/addressbookroot.php |  3 +++
 apps/dav/lib/carddav/carddavbackend.php  | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'apps/dav/lib/carddav')

diff --git a/apps/dav/lib/carddav/addressbookroot.php b/apps/dav/lib/carddav/addressbookroot.php
index 2680135dec2..99c36c2e767 100644
--- a/apps/dav/lib/carddav/addressbookroot.php
+++ b/apps/dav/lib/carddav/addressbookroot.php
@@ -40,6 +40,9 @@ class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
 
 	function getName() {
 
+		if ($this->principalPrefix === 'principals') {
+			return parent::getName();
+		}
 		// Grabbing all the components of the principal path.
 		$parts = explode('/', $this->principalPrefix);
 
diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php
index 9ca166c22a2..b2a54adc49d 100644
--- a/apps/dav/lib/carddav/carddavbackend.php
+++ b/apps/dav/lib/carddav/carddavbackend.php
@@ -93,11 +93,11 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @return array
 	 */
 	function getAddressBooksForUser($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->createParameter('principaluri')))
-			->setParameter('principaluri', $principalUri);
+			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
 
 		$addressBooks = [];
 
@@ -106,7 +106,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 			$addressBooks[$row['id']] = [
 				'id'  => $row['id'],
 				'uri' => $row['uri'],
-				'principaluri' => $row['principaluri'],
+				'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 				'{DAV:}displayname' => $row['displayname'],
 				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
 				'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
@@ -919,4 +919,15 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	public function applyShareAcl($addressBookId, $acl) {
 		return $this->sharingBackend->applyShareAcl($addressBookId, $acl);
 	}
+
+	private function convertPrincipal($principalUri, $toV2) {
+		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
+			list(, $name) = URLUtil::splitPath($principalUri);
+			if ($toV2 === true) {
+				return "principals/users/$name";
+			}
+			return "principals/$name";
+		}
+		return $principalUri;
+	}
 }
-- 
cgit v1.2.3