nextcloud / server

apps/files_trashbin/appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 // register hooks
 \OCA\Files_Trashbin\Trashbin::registerHooks();
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('files_trashbin');
 	return [
 		'id' => 'trashbin',

Indentation +9 added lines, -9 removed lines

@@ -29,13 +29,13 @@
 \OCA\Files_Trashbin\Trashbin::registerHooks();
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('files_trashbin');
-	return [
-		'id' => 'trashbin',
-		'appname' => 'files_trashbin',
-		'script' => 'list.php',
-		'order' => 50,
-		'name' => $l->t('Deleted files'),
-		'classes' => 'pinned',
-	];
+    $l = \OC::$server->getL10N('files_trashbin');
+    return [
+        'id' => 'trashbin',
+        'appname' => 'files_trashbin',
+        'script' => 'list.php',
+        'order' => 50,
+        'name' => $l->t('Deleted files'),
+        'classes' => 'pinned',
+    ];
 });

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 +117 added lines, -117 removed lines

@@ -31,122 +31,122 @@
 
 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;
-
-		if ($image !== null && isset($userData[AccountManager::PROPERTY_AVATAR])) {
-			$userData[AccountManager::PROPERTY_AVATAR]['value'] = true;
-		}
-
-		foreach ($userData as $property => $value) {
-
-			$shareWithTrustedServers =
-				$value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
-				$value['scope'] === AccountManager::VISIBILITY_PUBLIC;
-
-			$emptyValue = !isset($value['value']) || $value['value'] === '';
-
-			if ($shareWithTrustedServers && !$emptyValue) {
-				$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 {
-			return $user->getAvatarImage(-1);
-		} 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;
+
+        if ($image !== null && isset($userData[AccountManager::PROPERTY_AVATAR])) {
+            $userData[AccountManager::PROPERTY_AVATAR]['value'] = true;
+        }
+
+        foreach ($userData as $property => $value) {
+
+            $shareWithTrustedServers =
+                $value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
+                $value['scope'] === AccountManager::VISIBILITY_PUBLIC;
+
+            $emptyValue = !isset($value['value']) || $value['value'] === '';
+
+            if ($shareWithTrustedServers && !$emptyValue) {
+                $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 {
+            return $user->getAvatarImage(-1);
+        } catch (\Exception $ex) {
+            return null;
+        }
+    }
 
 }

apps/federation/lib/SyncFederationAddressBooks.php

Indentation +53 added lines, -53 removed lines

@@ -30,64 +30,64 @@
 
 class SyncFederationAddressBooks {
 
-	/** @var DbHandler */
-	protected $dbHandler;
+    /** @var DbHandler */
+    protected $dbHandler;
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/** @var  DiscoveryService */
-	private $ocsDiscoveryService;
+    /** @var  DiscoveryService */
+    private $ocsDiscoveryService;
 
-	/**
-	 * @param DbHandler $dbHandler
-	 * @param SyncService $syncService
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 */
-	public function __construct(DbHandler $dbHandler,
-								SyncService $syncService,
-								IDiscoveryService $ocsDiscoveryService
-	) {
-		$this->syncService = $syncService;
-		$this->dbHandler = $dbHandler;
-		$this->ocsDiscoveryService = $ocsDiscoveryService;
-	}
+    /**
+     * @param DbHandler $dbHandler
+     * @param SyncService $syncService
+     * @param IDiscoveryService $ocsDiscoveryService
+     */
+    public function __construct(DbHandler $dbHandler,
+                                SyncService $syncService,
+                                IDiscoveryService $ocsDiscoveryService
+    ) {
+        $this->syncService = $syncService;
+        $this->dbHandler = $dbHandler;
+        $this->ocsDiscoveryService = $ocsDiscoveryService;
+    }
 
-	/**
-	 * @param \Closure $callback
-	 */
-	public function syncThemAll(\Closure $callback) {
+    /**
+     * @param \Closure $callback
+     */
+    public function syncThemAll(\Closure $callback) {
 
-		$trustedServers = $this->dbHandler->getAllServer();
-		foreach ($trustedServers as $trustedServer) {
-			$url = $trustedServer['url'];
-			$callback($url, null);
-			$sharedSecret = $trustedServer['shared_secret'];
-			$syncToken = $trustedServer['sync_token'];
+        $trustedServers = $this->dbHandler->getAllServer();
+        foreach ($trustedServers as $trustedServer) {
+            $url = $trustedServer['url'];
+            $callback($url, null);
+            $sharedSecret = $trustedServer['shared_secret'];
+            $syncToken = $trustedServer['sync_token'];
 
-			$endPoints = $this->ocsDiscoveryService->discover($url, 'FEDERATED_SHARING');
-			$cardDavUser = isset($endPoints['carddav-user']) ? $endPoints['carddav-user'] : 'system';
-			$addressBookUrl = isset($endPoints['system-address-book']) ? trim($endPoints['system-address-book'], '/') : 'remote.php/dav/addressbooks/system/system/system';
+            $endPoints = $this->ocsDiscoveryService->discover($url, 'FEDERATED_SHARING');
+            $cardDavUser = isset($endPoints['carddav-user']) ? $endPoints['carddav-user'] : 'system';
+            $addressBookUrl = isset($endPoints['system-address-book']) ? trim($endPoints['system-address-book'], '/') : 'remote.php/dav/addressbooks/system/system/system';
 
-			if (is_null($sharedSecret)) {
-				continue;
-			}
-			$targetBookId = $trustedServer['url_hash'];
-			$targetPrincipal = "principals/system/system";
-			$targetBookProperties = [
-					'{DAV:}displayname' => $url
-			];
-			try {
-				$newToken = $this->syncService->syncRemoteAddressBook($url, $cardDavUser, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
-				if ($newToken !== $syncToken) {
-					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
-				}
-			} catch (\Exception $ex) {
-				if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
-				}
-				$callback($url, $ex);
-			}
-		}
-	}
+            if (is_null($sharedSecret)) {
+                continue;
+            }
+            $targetBookId = $trustedServer['url_hash'];
+            $targetPrincipal = "principals/system/system";
+            $targetBookProperties = [
+                    '{DAV:}displayname' => $url
+            ];
+            try {
+                $newToken = $this->syncService->syncRemoteAddressBook($url, $cardDavUser, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
+                if ($newToken !== $syncToken) {
+                    $this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
+                }
+            } catch (\Exception $ex) {
+                if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+                    $this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
+                }
+                $callback($url, $ex);
+            }
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php

Indentation +25 added lines, -25 removed lines

@@ -39,33 +39,33 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	protected $server;
+    /** @var \Sabre\DAV\Server */
+    protected $server;
 
-	/**
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 200);
-	}
+    /**
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 200);
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return false
-	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
-			'WebDAV clients such as the Nextcloud desktop sync client.';
-		$stream = fopen('php://memory','r+');
-		fwrite($stream, $string);
-		rewind($stream);
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return false
+     */
+    function httpGet(RequestInterface $request, ResponseInterface $response) {
+        $string = 'This is the WebDAV interface. It can only be accessed by ' .
+            'WebDAV clients such as the Nextcloud desktop sync client.';
+        $stream = fopen('php://memory','r+');
+        fwrite($stream, $string);
+        rewind($stream);
 
-		$response->setStatus(200);
-		$response->setBody($stream);
+        $response->setStatus(200);
+        $response->setBody($stream);
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -57,9 +57,9 @@
 	 * @return false
 	 */
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
+		$string = 'This is the WebDAV interface. It can only be accessed by '.
 			'WebDAV clients such as the Nextcloud desktop sync client.';
-		$stream = fopen('php://memory','r+');
+		$stream = fopen('php://memory', 'r+');
 		fwrite($stream, $string);
 		rewind($stream);
 

lib/private/Migration/ConsoleOutput.php

Indentation +46 added lines, -46 removed lines

@@ -37,57 +37,57 @@
  */
 class ConsoleOutput implements IOutput {
 
-	/** @var OutputInterface */
-	private $output;
+    /** @var OutputInterface */
+    private $output;
 
-	/** @var ProgressBar */
-	private $progressBar;
+    /** @var ProgressBar */
+    private $progressBar;
 
-	public function __construct(OutputInterface $output) {
-		$this->output = $output;
-	}
+    public function __construct(OutputInterface $output) {
+        $this->output = $output;
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		$this->output->writeln("<info>$message</info>");
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        $this->output->writeln("<info>$message</info>");
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		$this->output->writeln("<comment>$message</comment>");
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        $this->output->writeln("<comment>$message</comment>");
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar->finish();
-		}
-		$this->progressBar = new ProgressBar($this->output);
-		$this->progressBar->start($max);
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar->finish();
+        }
+        $this->progressBar = new ProgressBar($this->output);
+        $this->progressBar->start($max);
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar = new ProgressBar($this->output);
-			$this->progressBar->start();
-		}
-		$this->progressBar->advance($step);
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar = new ProgressBar($this->output);
+            $this->progressBar->start();
+        }
+        $this->progressBar->advance($step);
+    }
 
-	public function finishProgress() {
-		if (is_null($this->progressBar)) {
-			return;
-		}
-		$this->progressBar->finish();
-	}
+    public function finishProgress() {
+        if (is_null($this->progressBar)) {
+            return;
+        }
+        $this->progressBar->finish();
+    }
 }

lib/private/Contacts/ContactsMenu/Entry.php

Indentation +136 added lines, -136 removed lines

@@ -29,141 +29,141 @@
 
 class Entry implements IEntry {
 
-	/** @var string|int|null */
-	private $id = null;
-
-	/** @var string */
-	private $fullName = '';
-
-	/** @var string[] */
-	private $emailAddresses = [];
-
-	/** @var string|null */
-	private $avatar;
-
-	/** @var IAction[] */
-	private $actions = [];
-
-	/** @var array */
-	private $properties = [];
-
-	/**
-	 * @param string $id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @param string $displayName
-	 */
-	public function setFullName($displayName) {
-		$this->fullName = $displayName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getFullName() {
-		return $this->fullName;
-	}
-
-	/**
-	 * @param string $address
-	 */
-	public function addEMailAddress($address) {
-		$this->emailAddresses[] = $address;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEMailAddresses() {
-		return $this->emailAddresses;
-	}
-
-	/**
-	 * @param string $avatar
-	 */
-	public function setAvatar($avatar) {
-		$this->avatar = $avatar;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAvatar() {
-		return $this->avatar;
-	}
-
-	/**
-	 * @param IAction $action
-	 */
-	public function addAction(IAction $action) {
-		$this->actions[] = $action;
-		$this->sortActions();
-	}
-
-	/**
-	 * @return IAction[]
-	 */
-	public function getActions() {
-		return $this->actions;
-	}
-
-	/**
-	 * sort the actions by priority and name
-	 */
-	private function sortActions() {
-		usort($this->actions, function(IAction $action1, IAction $action2) {
-			$prio1 = $action1->getPriority();
-			$prio2 = $action2->getPriority();
-
-			if ($prio1 === $prio2) {
-				// Ascending order for same priority
-				return strcasecmp($action1->getName(), $action2->getName());
-			}
-
-			// Descending order when priority differs
-			return $prio2 - $prio1;
-		});
-	}
-
-	/**
-	 * @param array $contact key-value array containing additional properties
-	 */
-	public function setProperties(array $contact) {
-		$this->properties = $contact;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getProperty($key) {
-		if (!isset($this->properties[$key])) {
-			return null;
-		}
-		return $this->properties[$key];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function(IAction $action) {
-			return $action->jsonSerialize();
-		}, array_slice($this->actions, 1));
-
-		return [
-			'id' => $this->id,
-			'fullName' => $this->fullName,
-			'avatar' => $this->getAvatar(),
-			'topAction' => $topAction,
-			'actions' => $otherActions,
-			'lastMessage' => '',
-		];
-	}
+    /** @var string|int|null */
+    private $id = null;
+
+    /** @var string */
+    private $fullName = '';
+
+    /** @var string[] */
+    private $emailAddresses = [];
+
+    /** @var string|null */
+    private $avatar;
+
+    /** @var IAction[] */
+    private $actions = [];
+
+    /** @var array */
+    private $properties = [];
+
+    /**
+     * @param string $id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @param string $displayName
+     */
+    public function setFullName($displayName) {
+        $this->fullName = $displayName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFullName() {
+        return $this->fullName;
+    }
+
+    /**
+     * @param string $address
+     */
+    public function addEMailAddress($address) {
+        $this->emailAddresses[] = $address;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEMailAddresses() {
+        return $this->emailAddresses;
+    }
+
+    /**
+     * @param string $avatar
+     */
+    public function setAvatar($avatar) {
+        $this->avatar = $avatar;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAvatar() {
+        return $this->avatar;
+    }
+
+    /**
+     * @param IAction $action
+     */
+    public function addAction(IAction $action) {
+        $this->actions[] = $action;
+        $this->sortActions();
+    }
+
+    /**
+     * @return IAction[]
+     */
+    public function getActions() {
+        return $this->actions;
+    }
+
+    /**
+     * sort the actions by priority and name
+     */
+    private function sortActions() {
+        usort($this->actions, function(IAction $action1, IAction $action2) {
+            $prio1 = $action1->getPriority();
+            $prio2 = $action2->getPriority();
+
+            if ($prio1 === $prio2) {
+                // Ascending order for same priority
+                return strcasecmp($action1->getName(), $action2->getName());
+            }
+
+            // Descending order when priority differs
+            return $prio2 - $prio1;
+        });
+    }
+
+    /**
+     * @param array $contact key-value array containing additional properties
+     */
+    public function setProperties(array $contact) {
+        $this->properties = $contact;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getProperty($key) {
+        if (!isset($this->properties[$key])) {
+            return null;
+        }
+        return $this->properties[$key];
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize() {
+        $topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
+        $otherActions = array_map(function(IAction $action) {
+            return $action->jsonSerialize();
+        }, array_slice($this->actions, 1));
+
+        return [
+            'id' => $this->id,
+            'fullName' => $this->fullName,
+            'avatar' => $this->getAvatar(),
+            'topAction' => $topAction,
+            'actions' => $otherActions,
+            'lastMessage' => '',
+        ];
+    }
 
 }

lib/public/Contacts/ContactsMenu/IEntry.php

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
  */
 interface IEntry extends JsonSerializable {
 
-	/**
-	 * @since 12.0
-	 * @return string
-	 */
-	public function getFullName();
+    /**
+     * @since 12.0
+     * @return string
+     */
+    public function getFullName();
 
-	/**
-	 * @since 12.0
-	 * @return string[]
-	 */
-	public function getEMailAddresses();
+    /**
+     * @since 12.0
+     * @return string[]
+     */
+    public function getEMailAddresses();
 
-	/**
-	 * @since 12.0
-	 * @return string|null image URI
-	 */
-	public function getAvatar();
+    /**
+     * @since 12.0
+     * @return string|null image URI
+     */
+    public function getAvatar();
 
-	/**
-	 * @since 12.0
-	 * @param IAction $action an action to show in the contacts menu
-	 */
-	public function addAction(IAction $action);
+    /**
+     * @since 12.0
+     * @param IAction $action an action to show in the contacts menu
+     */
+    public function addAction(IAction $action);
 
-	/**
-	 * Get an arbitrary property from the contact
-	 *
-	 * @since 12.0
-	 * @param string $key
-	 * @return mixed the value of the property or null
-	 */
-	public function getProperty($key);
+    /**
+     * Get an arbitrary property from the contact
+     *
+     * @since 12.0
+     * @param string $key
+     * @return mixed the value of the property or null
+     */
+    public function getProperty($key);
 }

apps/files_trashbin/lib/Helper.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 		$result = array();
 		$timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+		$view = new \OC\Files\View('/'.$user.'/files_trashbin/files');
 
 		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
 			throw new \Exception('Directory does not exists');
@@ -72,7 +72,7 @@ 
 				$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
 			}
 			$originalPath = '';
-			$originalName = substr($entryName, 0, -strlen($timestamp)-2);
+			$originalName = substr($entryName, 0, -strlen($timestamp) - 2);
 			if (isset($originalLocations[$originalName][$timestamp])) {
 				$originalPath = $originalLocations[$originalName][$timestamp];
 				if (substr($originalPath, -1) === '/') {
@@ -92,12 +92,12 @@ 
 			);
 			if ($originalPath) {
 				if ($originalPath !== '.') {
-					$i['extraData'] = $originalPath . '/' . $originalName;
+					$i['extraData'] = $originalPath.'/'.$originalName;
 				} else {
 					$i['extraData'] = $originalName;
 				}
 			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+			$result[] = new FileInfo($absoluteDir.'/'.$i['name'], $storage, $internalPath.'/'.$i['name'], $i, $mount);
 		}
 
 		if ($sortAttribute !== '') {

Indentation +85 added lines, -85 removed lines

@@ -33,96 +33,96 @@
 use OCP\Files\Cache\ICacheEntry;
 
 class Helper {
-	/**
-	 * Retrieves the contents of a trash bin directory.
-	 *
-	 * @param string $dir path to the directory inside the trashbin
-	 * or empty to retrieve the root of the trashbin
-	 * @param string $user
-	 * @param string $sortAttribute attribute to sort on or empty to disable sorting
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[]
-	 */
-	public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
-		$result = array();
-		$timestamp = null;
+    /**
+     * Retrieves the contents of a trash bin directory.
+     *
+     * @param string $dir path to the directory inside the trashbin
+     * or empty to retrieve the root of the trashbin
+     * @param string $user
+     * @param string $sortAttribute attribute to sort on or empty to disable sorting
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[]
+     */
+    public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
+        $result = array();
+        $timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+        $view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
 
-		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
-			throw new \Exception('Directory does not exists');
-		}
+        if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
+            throw new \Exception('Directory does not exists');
+        }
 
-		$mount = $view->getMount($dir);
-		$storage = $mount->getStorage();
-		$absoluteDir = $view->getAbsolutePath($dir);
-		$internalPath = $mount->getInternalPath($absoluteDir);
+        $mount = $view->getMount($dir);
+        $storage = $mount->getStorage();
+        $absoluteDir = $view->getAbsolutePath($dir);
+        $internalPath = $mount->getInternalPath($absoluteDir);
 
-		$originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
-		$dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
-		foreach ($dirContent as $entry) {
-			$entryName = $entry->getName();
-			$name = $entryName;
-			if ($dir === '' || $dir === '/') {
-				$pathparts = pathinfo($entryName);
-				$timestamp = substr($pathparts['extension'], 1);
-				$name = $pathparts['filename'];
+        $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
+        $dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
+        foreach ($dirContent as $entry) {
+            $entryName = $entry->getName();
+            $name = $entryName;
+            if ($dir === '' || $dir === '/') {
+                $pathparts = pathinfo($entryName);
+                $timestamp = substr($pathparts['extension'], 1);
+                $name = $pathparts['filename'];
 
-			} else if ($timestamp === null) {
-				// for subfolders we need to calculate the timestamp only once
-				$parts = explode('/', ltrim($dir, '/'));
-				$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
-			}
-			$originalPath = '';
-			$originalName = substr($entryName, 0, -strlen($timestamp)-2);
-			if (isset($originalLocations[$originalName][$timestamp])) {
-				$originalPath = $originalLocations[$originalName][$timestamp];
-				if (substr($originalPath, -1) === '/') {
-					$originalPath = substr($originalPath, 0, -1);
-				}
-			}
-			$type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
-			$i = array(
-				'name' => $name,
-				'mtime' => $timestamp,
-				'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
-				'type' => $type,
-				'directory' => ($dir === '/') ? '' : $dir,
-				'size' => $entry->getSize(),
-				'etag' => '',
-				'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE,
-				'fileid' => $entry->getId(),
-			);
-			if ($originalPath) {
-				if ($originalPath !== '.') {
-					$i['extraData'] = $originalPath . '/' . $originalName;
-				} else {
-					$i['extraData'] = $originalName;
-				}
-			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
-		}
+            } else if ($timestamp === null) {
+                // for subfolders we need to calculate the timestamp only once
+                $parts = explode('/', ltrim($dir, '/'));
+                $timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
+            }
+            $originalPath = '';
+            $originalName = substr($entryName, 0, -strlen($timestamp)-2);
+            if (isset($originalLocations[$originalName][$timestamp])) {
+                $originalPath = $originalLocations[$originalName][$timestamp];
+                if (substr($originalPath, -1) === '/') {
+                    $originalPath = substr($originalPath, 0, -1);
+                }
+            }
+            $type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
+            $i = array(
+                'name' => $name,
+                'mtime' => $timestamp,
+                'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
+                'type' => $type,
+                'directory' => ($dir === '/') ? '' : $dir,
+                'size' => $entry->getSize(),
+                'etag' => '',
+                'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE,
+                'fileid' => $entry->getId(),
+            );
+            if ($originalPath) {
+                if ($originalPath !== '.') {
+                    $i['extraData'] = $originalPath . '/' . $originalName;
+                } else {
+                    $i['extraData'] = $originalName;
+                }
+            }
+            $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+        }
 
-		if ($sortAttribute !== '') {
-			return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
-		}
-		return $result;
-	}
+        if ($sortAttribute !== '') {
+            return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
+        }
+        return $result;
+    }
 
-	/**
-	 * Format file infos for JSON
-	 *
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = array();
-		foreach ($fileInfos as $i) {
-			$entry = \OCA\Files\Helper::formatFileInfo($i);
-			$entry['id'] = $i->getId();
-			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
-			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
-			$files[] = $entry;
-		}
-		return $files;
-	}
+    /**
+     * Format file infos for JSON
+     *
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = array();
+        foreach ($fileInfos as $i) {
+            $entry = \OCA\Files\Helper::formatFileInfo($i);
+            $entry['id'] = $i->getId();
+            $entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
+            $entry['permissions'] = \OCP\Constants::PERMISSION_READ;
+            $files[] = $entry;
+        }
+        return $files;
+    }
 }

apps/dav/lib/CardDAV/SyncService.php

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

Indentation +298 added lines, -298 removed lines

@@ -39,304 +39,304 @@
 
 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;
-		$this->certPath = '';
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @param int $targetBookId
-	 * @param string $targetPrincipal
-	 * @param array $targetProperties
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $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, $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->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, $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'];
-	}
-
-	/**
-	 * @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);
-	}
-
-	/**
-	 * Check if there is a valid certPath we should use
-	 *
-	 * @return string
-	 */
-	protected function getCertPath() {
-
-		// we already have a valid certPath
-		if ($this->certPath !== '') {
-			return $this->certPath;
-		}
-
-		/** @var ICertificateManager $certManager */
-		$certManager = \OC::$server->getCertificateManager(null);
-		$certPath = $certManager->getAbsoluteBundlePath();
-		if (file_exists($certPath)) {
-			$this->certPath = $certPath;
-		}
-
-		return $this->certPath;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @return Client
-	 */
-	protected function getClient($url, $userName, $sharedSecret) {
-		$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;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @return array
-	 */
-	 protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
-		 $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']);
-	 }
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @param string $resourcePath
-	 * @return array
-	 */
-	protected function download($url, $userName, $sharedSecret, $resourcePath) {
-		$client = $this->getClient($url, $userName, $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);
-		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'];
-		$converter = new Converter($this->accountManager);
-		$name = $user->getBackendClassName();
-		$userId = $user->getUID();
-
-		$cardId = "$name:$userId.vcf";
-		$card = $this->backend->getCard($addressBookId, $cardId);
-		if ($user->isEnabled()) {
-			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());
-				}
-			}
-		} else {
-			$this->backend->deleteCard($addressBookId, $cardId);
-		}
-	}
-
-	/**
-	 * @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->callForSeenUsers(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;
+        $this->certPath = '';
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @param int $targetBookId
+     * @param string $targetPrincipal
+     * @param array $targetProperties
+     * @return string
+     * @throws \Exception
+     */
+    public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $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, $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->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, $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'];
+    }
+
+    /**
+     * @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);
+    }
+
+    /**
+     * Check if there is a valid certPath we should use
+     *
+     * @return string
+     */
+    protected function getCertPath() {
+
+        // we already have a valid certPath
+        if ($this->certPath !== '') {
+            return $this->certPath;
+        }
+
+        /** @var ICertificateManager $certManager */
+        $certManager = \OC::$server->getCertificateManager(null);
+        $certPath = $certManager->getAbsoluteBundlePath();
+        if (file_exists($certPath)) {
+            $this->certPath = $certPath;
+        }
+
+        return $this->certPath;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @return Client
+     */
+    protected function getClient($url, $userName, $sharedSecret) {
+        $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;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @return array
+     */
+        protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
+            $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']);
+        }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @param string $resourcePath
+     * @return array
+     */
+    protected function download($url, $userName, $sharedSecret, $resourcePath) {
+        $client = $this->getClient($url, $userName, $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);
+        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'];
+        $converter = new Converter($this->accountManager);
+        $name = $user->getBackendClassName();
+        $userId = $user->getUID();
+
+        $cardId = "$name:$userId.vcf";
+        $card = $this->backend->getCard($addressBookId, $cardId);
+        if ($user->isEnabled()) {
+            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());
+                }
+            }
+        } else {
+            $this->backend->deleteCard($addressBookId, $cardId);
+        }
+    }
+
+    /**
+     * @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->callForSeenUsers(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']);
+            }
+        }
+    }
 
 
 }