nextcloud / server

apps/federation/lib/Middleware/AddServerMiddleware.php

Indentation +34 added lines, -34 removed lines

@@ -34,45 +34,45 @@
 
 class AddServerMiddleware extends Middleware {
 
-	/** @var  string */
-	protected $appName;
+    /** @var  string */
+    protected $appName;
 
-	/** @var  IL10N */
-	protected $l;
+    /** @var  IL10N */
+    protected $l;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	public function __construct($appName, IL10N $l, ILogger $logger) {
-		$this->appName = $appName;
-		$this->l = $l;
-		$this->logger = $logger;
-	}
+    public function __construct($appName, IL10N $l, ILogger $logger) {
+        $this->appName = $appName;
+        $this->l = $l;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Log error message and return a response which can be displayed to the user
-	 *
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return JSONResponse
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (($controller instanceof SettingsController) === false) {
-			throw $exception;
-		}
-		$this->logger->error($exception->getMessage(), ['app' => $this->appName]);
-		if ($exception instanceof HintException) {
-			$message = $exception->getHint();
-		} else {
-			$message = $exception->getMessage();
-		}
+    /**
+     * Log error message and return a response which can be displayed to the user
+     *
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return JSONResponse
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (($controller instanceof SettingsController) === false) {
+            throw $exception;
+        }
+        $this->logger->error($exception->getMessage(), ['app' => $this->appName]);
+        if ($exception instanceof HintException) {
+            $message = $exception->getHint();
+        } else {
+            $message = $exception->getMessage();
+        }
 
-		return new JSONResponse(
-			['message' => $message],
-			Http::STATUS_BAD_REQUEST
-		);
+        return new JSONResponse(
+            ['message' => $message],
+            Http::STATUS_BAD_REQUEST
+        );
 
-	}
+    }
 
 }

apps/dav/lib/CardDAV/Converter.php

Spacing +2 added lines, -2 removed lines

@@ -119,9 +119,9 @@
 		$elements = explode(' ', $fullName);
 		$result = ['', '', '', '', ''];
 		if (count($elements) > 2) {
-			$result[0] = implode(' ', array_slice($elements, count($elements)-1));
+			$result[0] = implode(' ', array_slice($elements, count($elements) - 1));
 			$result[1] = $elements[0];
-			$result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
+			$result[2] = implode(' ', array_slice($elements, 1, count($elements) - 2));
 		} elseif (count($elements) === 2) {
 			$result[0] = $elements[1];
 			$result[1] = $elements[0];

Indentation +115 added lines, -115 removed lines

@@ -30,120 +30,120 @@
 
 class Converter {
 
-	/** @var AccountManager */
-	private $accountManager;
-
-	/**
-	 * Converter constructor.
-	 *
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(AccountManager $accountManager) {
-		$this->accountManager = $accountManager;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return VCard|null
-	 */
-	public function createCardFromUser(IUser $user) {
-
-		$userData = $this->accountManager->getUser($user);
-
-		$uid = $user->getUID();
-		$cloudId = $user->getCloudId();
-		$image = $this->getAvatarImage($user);
-
-		$vCard = new VCard();
-		$vCard->VERSION = '3.0';
-		$vCard->UID = $uid;
-
-		$publish = false;
-
-		foreach ($userData as $property => $value) {
-
-			$shareWithTrustedServers =
-				$value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
-				$value['scope'] === AccountManager::VISIBILITY_PUBLIC;
-
-			$emptyValue = !isset($value['value']) || $value['value'] === '';
-			$noImage = $image === null;
-
-			if ($shareWithTrustedServers && (!$emptyValue || !$noImage)) {
-				$publish = true;
-				switch ($property) {
-					case AccountManager::PROPERTY_DISPLAYNAME:
-						$vCard->add(new Text($vCard, 'FN', $value['value']));
-						$vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
-						break;
-					case AccountManager::PROPERTY_AVATAR:
-						if ($image !== null) {
-							$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
-						}
-						break;
-					case AccountManager::PROPERTY_EMAIL:
-						$vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case AccountManager::PROPERTY_WEBSITE:
-						$vCard->add(new Text($vCard, 'URL', $value['value']));
-						break;
-					case AccountManager::PROPERTY_PHONE:
-						$vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case AccountManager::PROPERTY_ADDRESS:
-						$vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case AccountManager::PROPERTY_TWITTER:
-						$vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
-						break;
-				}
-			}
-		}
-
-		if ($publish && !empty($cloudId)) {
-			$vCard->add(new Text($vCard, 'CLOUD', $cloudId));
-			$vCard->validate();
-			return $vCard;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param string $fullName
-	 * @return string[]
-	 */
-	public function splitFullName($fullName) {
-		// Very basic western style parsing. I'm not gonna implement
-		// https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
-
-		$elements = explode(' ', $fullName);
-		$result = ['', '', '', '', ''];
-		if (count($elements) > 2) {
-			$result[0] = implode(' ', array_slice($elements, count($elements)-1));
-			$result[1] = $elements[0];
-			$result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
-		} elseif (count($elements) === 2) {
-			$result[0] = $elements[1];
-			$result[1] = $elements[0];
-		} else {
-			$result[0] = $elements[0];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return null|IImage
-	 */
-	private function getAvatarImage(IUser $user) {
-		try {
-			$image = $user->getAvatarImage(-1);
-			return $image;
-		} catch (\Exception $ex) {
-			return null;
-		}
-	}
+    /** @var AccountManager */
+    private $accountManager;
+
+    /**
+     * Converter constructor.
+     *
+     * @param AccountManager $accountManager
+     */
+    public function __construct(AccountManager $accountManager) {
+        $this->accountManager = $accountManager;
+    }
+
+    /**
+     * @param IUser $user
+     * @return VCard|null
+     */
+    public function createCardFromUser(IUser $user) {
+
+        $userData = $this->accountManager->getUser($user);
+
+        $uid = $user->getUID();
+        $cloudId = $user->getCloudId();
+        $image = $this->getAvatarImage($user);
+
+        $vCard = new VCard();
+        $vCard->VERSION = '3.0';
+        $vCard->UID = $uid;
+
+        $publish = false;
+
+        foreach ($userData as $property => $value) {
+
+            $shareWithTrustedServers =
+                $value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
+                $value['scope'] === AccountManager::VISIBILITY_PUBLIC;
+
+            $emptyValue = !isset($value['value']) || $value['value'] === '';
+            $noImage = $image === null;
+
+            if ($shareWithTrustedServers && (!$emptyValue || !$noImage)) {
+                $publish = true;
+                switch ($property) {
+                    case AccountManager::PROPERTY_DISPLAYNAME:
+                        $vCard->add(new Text($vCard, 'FN', $value['value']));
+                        $vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
+                        break;
+                    case AccountManager::PROPERTY_AVATAR:
+                        if ($image !== null) {
+                            $vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
+                        }
+                        break;
+                    case AccountManager::PROPERTY_EMAIL:
+                        $vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case AccountManager::PROPERTY_WEBSITE:
+                        $vCard->add(new Text($vCard, 'URL', $value['value']));
+                        break;
+                    case AccountManager::PROPERTY_PHONE:
+                        $vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case AccountManager::PROPERTY_ADDRESS:
+                        $vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case AccountManager::PROPERTY_TWITTER:
+                        $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
+                        break;
+                }
+            }
+        }
+
+        if ($publish && !empty($cloudId)) {
+            $vCard->add(new Text($vCard, 'CLOUD', $cloudId));
+            $vCard->validate();
+            return $vCard;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $fullName
+     * @return string[]
+     */
+    public function splitFullName($fullName) {
+        // Very basic western style parsing. I'm not gonna implement
+        // https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
+
+        $elements = explode(' ', $fullName);
+        $result = ['', '', '', '', ''];
+        if (count($elements) > 2) {
+            $result[0] = implode(' ', array_slice($elements, count($elements)-1));
+            $result[1] = $elements[0];
+            $result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
+        } elseif (count($elements) === 2) {
+            $result[0] = $elements[1];
+            $result[1] = $elements[0];
+        } else {
+            $result[0] = $elements[0];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param IUser $user
+     * @return null|IImage
+     */
+    private function getAvatarImage(IUser $user) {
+        try {
+            $image = $user->getAvatarImage(-1);
+            return $image;
+        } catch (\Exception $ex) {
+            return null;
+        }
+    }
 
 }

apps/dav/lib/CardDAV/SyncService.php

Indentation +275 added lines, -275 removed lines

@@ -37,281 +37,281 @@
 
 class SyncService {
 
-	/** @var CardDavBackend */
-	private $backend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var array */
-	private $localSystemAddressBook;
-
-	/** @var AccountManager */
-	private $accountManager;
-
-	/** @var string */
-	protected $certPath;
-
-	/**
-	 * SyncService constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
-		$this->backend = $backend;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->accountManager = $accountManager;
-
-		$certManager = \OC::$server->getCertificateManager(null);
-		$certPath = $certManager->getAbsoluteBundlePath();
-		if (file_exists($certPath)) {
-			$this->certPath = $certPath;
-		}
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @param int $targetBookId
-	 * @param string $targetPrincipal
-	 * @param array $targetProperties
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function syncRemoteAddressBook($url, $userName, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
-		// 1. create addressbook
-		$book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
-		$addressBookId = $book['id'];
-
-		// 2. query changes
-		try {
-			$response = $this->requestSyncReport($url, $userName, $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->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
-				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, $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'];
-	}
-
-	/**
-	 * @param string $principal
-	 * @param string $id
-	 * @param array $properties
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureSystemAddressBookExists($principal, $id, $properties) {
-		$book = $this->backend->getAddressBooksByUri($principal, $id);
-		if (!is_null($book)) {
-			return $book;
-		}
-		$this->backend->createAddressBook($principal, $id, $properties);
-
-		return $this->backend->getAddressBooksByUri($principal, $id);
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @return Client
-	 */
-	protected function getClient($url, $userName, $sharedSecret) {
-		$settings = [
-			'baseUri' => $url . '/',
-			'userName' => $userName,
-			'password' => $sharedSecret,
-		];
-		$client = new Client($settings);
-		$client->setThrowExceptions(true);
-
-		if (strpos($url, 'http://') !== 0 && $this->certPath) {
-			$client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-
-		return $client;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @return array
-	 */
-	protected function requestSyncReport($url, $userName, $sharedSecret, $syncToken) {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-
-		$addressBookUrl = "remote.php/dav/addressbooks/system/system/system";
-		$body = $this->buildSyncCollectionRequestBody($syncToken);
-
-		$response = $client->request('REPORT', $addressBookUrl, $body, [
-			'Content-Type' => 'application/xml'
-		]);
-
-		return $this->parseMultiStatus($response['body']);
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $sharedSecret
-	 * @param string $resourcePath
-	 * @return array
-	 */
-	protected function download($url, $sharedSecret, $resourcePath) {
-		$client = $this->getClient($url, 'system', $sharedSecret);
-		return $client->request('GET', $resourcePath);
-	}
-
-	/**
-	 * @param string|null $syncToken
-	 * @return string
-	 */
-	private function buildSyncCollectionRequestBody($syncToken) {
-
-		$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);
-		$body = $dom->saveXML();
-
-		return $body;
-	}
-
-	/**
-	 * @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($user) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$addressBookId = $systemAddressBook['id'];
-		$converter = new Converter($this->accountManager);
-		$name = $user->getBackendClassName();
-		$userId = $user->getUID();
-
-		$cardId = "$name:$userId.vcf";
-		$card = $this->backend->getCard($addressBookId, $cardId);
-		if ($card === false) {
-			$vCard = $converter->createCardFromUser($user);
-			if ($vCard !== null) {
-				$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
-			}
-		} else {
-			$vCard = $converter->createCardFromUser($user);
-			if (is_null($vCard)) {
-				$this->backend->deleteCard($addressBookId, $cardId);
-			} else {
-				$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
-			}
-		}
-	}
-
-	/**
-	 * @param IUser|string $userOrCardId
-	 */
-	public function deleteUser($userOrCardId) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		if ($userOrCardId instanceof IUser){
-			$name = $userOrCardId->getBackendClassName();
-			$userId = $userOrCardId->getUID();
-
-			$userOrCardId = "$name:$userId.vcf";
-		}
-		$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']);
-			}
-		}
-	}
+    /** @var CardDavBackend */
+    private $backend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var array */
+    private $localSystemAddressBook;
+
+    /** @var AccountManager */
+    private $accountManager;
+
+    /** @var string */
+    protected $certPath;
+
+    /**
+     * SyncService constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param AccountManager $accountManager
+     */
+    public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
+        $this->backend = $backend;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->accountManager = $accountManager;
+
+        $certManager = \OC::$server->getCertificateManager(null);
+        $certPath = $certManager->getAbsoluteBundlePath();
+        if (file_exists($certPath)) {
+            $this->certPath = $certPath;
+        }
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @param int $targetBookId
+     * @param string $targetPrincipal
+     * @param array $targetProperties
+     * @return string
+     * @throws \Exception
+     */
+    public function syncRemoteAddressBook($url, $userName, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
+        // 1. create addressbook
+        $book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
+        $addressBookId = $book['id'];
+
+        // 2. query changes
+        try {
+            $response = $this->requestSyncReport($url, $userName, $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->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+                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, $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'];
+    }
+
+    /**
+     * @param string $principal
+     * @param string $id
+     * @param array $properties
+     * @return array|null
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureSystemAddressBookExists($principal, $id, $properties) {
+        $book = $this->backend->getAddressBooksByUri($principal, $id);
+        if (!is_null($book)) {
+            return $book;
+        }
+        $this->backend->createAddressBook($principal, $id, $properties);
+
+        return $this->backend->getAddressBooksByUri($principal, $id);
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @return Client
+     */
+    protected function getClient($url, $userName, $sharedSecret) {
+        $settings = [
+            'baseUri' => $url . '/',
+            'userName' => $userName,
+            'password' => $sharedSecret,
+        ];
+        $client = new Client($settings);
+        $client->setThrowExceptions(true);
+
+        if (strpos($url, 'http://') !== 0 && $this->certPath) {
+            $client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+
+        return $client;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @return array
+     */
+    protected function requestSyncReport($url, $userName, $sharedSecret, $syncToken) {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+
+        $addressBookUrl = "remote.php/dav/addressbooks/system/system/system";
+        $body = $this->buildSyncCollectionRequestBody($syncToken);
+
+        $response = $client->request('REPORT', $addressBookUrl, $body, [
+            'Content-Type' => 'application/xml'
+        ]);
+
+        return $this->parseMultiStatus($response['body']);
+    }
+
+    /**
+     * @param string $url
+     * @param string $sharedSecret
+     * @param string $resourcePath
+     * @return array
+     */
+    protected function download($url, $sharedSecret, $resourcePath) {
+        $client = $this->getClient($url, 'system', $sharedSecret);
+        return $client->request('GET', $resourcePath);
+    }
+
+    /**
+     * @param string|null $syncToken
+     * @return string
+     */
+    private function buildSyncCollectionRequestBody($syncToken) {
+
+        $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);
+        $body = $dom->saveXML();
+
+        return $body;
+    }
+
+    /**
+     * @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($user) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $addressBookId = $systemAddressBook['id'];
+        $converter = new Converter($this->accountManager);
+        $name = $user->getBackendClassName();
+        $userId = $user->getUID();
+
+        $cardId = "$name:$userId.vcf";
+        $card = $this->backend->getCard($addressBookId, $cardId);
+        if ($card === false) {
+            $vCard = $converter->createCardFromUser($user);
+            if ($vCard !== null) {
+                $this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+            }
+        } else {
+            $vCard = $converter->createCardFromUser($user);
+            if (is_null($vCard)) {
+                $this->backend->deleteCard($addressBookId, $cardId);
+            } else {
+                $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+            }
+        }
+    }
+
+    /**
+     * @param IUser|string $userOrCardId
+     */
+    public function deleteUser($userOrCardId) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        if ($userOrCardId instanceof IUser){
+            $name = $userOrCardId->getBackendClassName();
+            $userId = $userOrCardId->getUID();
+
+            $userOrCardId = "$name:$userId.vcf";
+        }
+        $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']);
+            }
+        }
+    }
 
 
 }

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
 			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
 				// remote server revoked access to the address book, remove it
 				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+				$this->logger->info('Authorization failed, remove address book: '.$url, ['app' => 'dav']);
 				throw $ex;
 			}
 		}
@@ -149,7 +149,7 @@ 
 	 */
 	protected function getClient($url, $userName, $sharedSecret) {
 		$settings = [
-			'baseUri' => $url . '/',
+			'baseUri' => $url.'/',
 			'userName' => $userName,
 			'password' => $sharedSecret,
 		];
@@ -269,7 +269,7 @@ 
 	 */
 	public function deleteUser($userOrCardId) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
-		if ($userOrCardId instanceof IUser){
+		if ($userOrCardId instanceof IUser) {
 			$name = $userOrCardId->getBackendClassName();
 			$userId = $userOrCardId->getUID();
 
@@ -285,7 +285,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'
 			]);
 		}
 
@@ -303,7 +303,7 @@ 
 
 		// remove no longer existing
 		$allCards = $this->backend->getCards($systemAddressBook['id']);
-		foreach($allCards as $card) {
+		foreach ($allCards as $card) {
 			$vCard = Reader::read($card['carddata']);
 			$uid = $vCard->UID->getValue();
 			// load backend and see if user exists