nextcloud / server

apps/dav/lib/Traits/PrincipalProxyTrait.php

Indentation +187 added lines, -187 removed lines

@@ -33,191 +33,191 @@
  */
 trait PrincipalProxyTrait {
 
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		$members = [];
-
-		if ($this->isProxyPrincipal($principal)) {
-			$realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal);
-			$principalArray = $this->getPrincipalByPath($realPrincipal);
-			if (!$principalArray) {
-				throw new Exception('Principal not found');
-			}
-
-			$proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']);
-			foreach ($proxies as $proxy) {
-				if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-					$members[] = $proxy->getProxyId();
-				}
-
-				if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-					$members[] = $proxy->getProxyId();
-				}
-			}
-		}
-
-		return $members;
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @param bool $needGroups
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal, $needGroups = false) {
-		list($prefix, $name) = \Sabre\Uri\split($principal);
-
-		if ($prefix !== $this->principalPrefix) {
-			return [];
-		}
-
-		$principalArray = $this->getPrincipalByPath($principal);
-		if (!$principalArray) {
-			throw new Exception('Principal not found');
-		}
-
-		$groups = [];
-		$proxies = $this->proxyMapper->getProxiesFor($principal);
-		foreach ($proxies as $proxy) {
-			if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
-			}
-
-			if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
-			}
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		list($principalUri, $target) = \Sabre\Uri\split($principal);
-
-		if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
-			throw new Exception('Setting members of the group is not supported yet');
-		}
-
-		$masterPrincipalArray = $this->getPrincipalByPath($principalUri);
-		if (!$masterPrincipalArray) {
-			throw new Exception('Principal not found');
-		}
-
-		$permission = ProxyMapper::PERMISSION_READ;
-		if ($target === 'calendar-proxy-write') {
-			$permission |= ProxyMapper::PERMISSION_WRITE;
-		}
-
-		list($prefix, $owner) = \Sabre\Uri\split($principalUri);
-		$proxies = $this->proxyMapper->getProxiesOf($principalUri);
-
-		foreach ($members as $member) {
-			list($prefix, $name) = \Sabre\Uri\split($member);
-
-			if ($prefix !== $this->principalPrefix) {
-				throw new Exception('Invalid member group prefix: ' . $prefix);
-			}
-
-			$principalArray = $this->getPrincipalByPath($member);
-			if (!$principalArray) {
-				throw new Exception('Principal not found');
-			}
-
-			$found = false;
-			foreach ($proxies as $proxy) {
-				if ($proxy->getProxyId() === $member) {
-					$found = true;
-					$proxy->setPermissions($proxy->getPermissions() | $permission);
-					$this->proxyMapper->update($proxy);
-
-					$proxies = array_filter($proxies, function(Proxy $p) use ($proxy) {
-						return $p->getId() !== $proxy->getId();
-					});
-					break;
-				}
-			}
-
-			if ($found === false) {
-				$proxy = new Proxy();
-				$proxy->setOwnerId($principalUri);
-				$proxy->setProxyId($member);
-				$proxy->setPermissions($permission);
-				$this->proxyMapper->insert($proxy);
-			}
-		}
-
-		// Delete all remaining proxies
-		foreach ($proxies as $proxy) {
-			// Write and Read Proxies have individual requests,
-			// so only delete proxies of this permission
-			if ($proxy->getPermissions() === $permission) {
-				$this->proxyMapper->delete($proxy);
-			}
-		}
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isProxyPrincipal(string $principalUri):bool {
-		list($realPrincipalUri, $proxy) = \Sabre\Uri\split($principalUri);
-		list($prefix, $userId) = \Sabre\Uri\split($realPrincipalUri);
-
-		if (!isset($prefix) || !isset($userId)) {
-			return false;
-		}
-		if ($prefix !== $this->principalPrefix) {
-			return false;
-		}
-
-		return $proxy === 'calendar-proxy-read'
-			|| $proxy === 'calendar-proxy-write';
-
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isReadProxyPrincipal(string $principalUri):bool {
-		list(, $proxy) = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-read';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isWriteProxyPrincipal(string $principalUri):bool {
-		list(, $proxy) = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-write';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return string
-	 */
-	private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
-		list($realPrincipalUri, ) = \Sabre\Uri\split($principalUri);
-		return $realPrincipalUri;
-	}
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        $members = [];
+
+        if ($this->isProxyPrincipal($principal)) {
+            $realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal);
+            $principalArray = $this->getPrincipalByPath($realPrincipal);
+            if (!$principalArray) {
+                throw new Exception('Principal not found');
+            }
+
+            $proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']);
+            foreach ($proxies as $proxy) {
+                if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
+                    $members[] = $proxy->getProxyId();
+                }
+
+                if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
+                    $members[] = $proxy->getProxyId();
+                }
+            }
+        }
+
+        return $members;
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @param bool $needGroups
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal, $needGroups = false) {
+        list($prefix, $name) = \Sabre\Uri\split($principal);
+
+        if ($prefix !== $this->principalPrefix) {
+            return [];
+        }
+
+        $principalArray = $this->getPrincipalByPath($principal);
+        if (!$principalArray) {
+            throw new Exception('Principal not found');
+        }
+
+        $groups = [];
+        $proxies = $this->proxyMapper->getProxiesFor($principal);
+        foreach ($proxies as $proxy) {
+            if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
+                $groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
+            }
+
+            if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
+                $groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
+            }
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        list($principalUri, $target) = \Sabre\Uri\split($principal);
+
+        if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
+            throw new Exception('Setting members of the group is not supported yet');
+        }
+
+        $masterPrincipalArray = $this->getPrincipalByPath($principalUri);
+        if (!$masterPrincipalArray) {
+            throw new Exception('Principal not found');
+        }
+
+        $permission = ProxyMapper::PERMISSION_READ;
+        if ($target === 'calendar-proxy-write') {
+            $permission |= ProxyMapper::PERMISSION_WRITE;
+        }
+
+        list($prefix, $owner) = \Sabre\Uri\split($principalUri);
+        $proxies = $this->proxyMapper->getProxiesOf($principalUri);
+
+        foreach ($members as $member) {
+            list($prefix, $name) = \Sabre\Uri\split($member);
+
+            if ($prefix !== $this->principalPrefix) {
+                throw new Exception('Invalid member group prefix: ' . $prefix);
+            }
+
+            $principalArray = $this->getPrincipalByPath($member);
+            if (!$principalArray) {
+                throw new Exception('Principal not found');
+            }
+
+            $found = false;
+            foreach ($proxies as $proxy) {
+                if ($proxy->getProxyId() === $member) {
+                    $found = true;
+                    $proxy->setPermissions($proxy->getPermissions() | $permission);
+                    $this->proxyMapper->update($proxy);
+
+                    $proxies = array_filter($proxies, function(Proxy $p) use ($proxy) {
+                        return $p->getId() !== $proxy->getId();
+                    });
+                    break;
+                }
+            }
+
+            if ($found === false) {
+                $proxy = new Proxy();
+                $proxy->setOwnerId($principalUri);
+                $proxy->setProxyId($member);
+                $proxy->setPermissions($permission);
+                $this->proxyMapper->insert($proxy);
+            }
+        }
+
+        // Delete all remaining proxies
+        foreach ($proxies as $proxy) {
+            // Write and Read Proxies have individual requests,
+            // so only delete proxies of this permission
+            if ($proxy->getPermissions() === $permission) {
+                $this->proxyMapper->delete($proxy);
+            }
+        }
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isProxyPrincipal(string $principalUri):bool {
+        list($realPrincipalUri, $proxy) = \Sabre\Uri\split($principalUri);
+        list($prefix, $userId) = \Sabre\Uri\split($realPrincipalUri);
+
+        if (!isset($prefix) || !isset($userId)) {
+            return false;
+        }
+        if ($prefix !== $this->principalPrefix) {
+            return false;
+        }
+
+        return $proxy === 'calendar-proxy-read'
+            || $proxy === 'calendar-proxy-write';
+
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isReadProxyPrincipal(string $principalUri):bool {
+        list(, $proxy) = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-read';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isWriteProxyPrincipal(string $principalUri):bool {
+        list(, $proxy) = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-write';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return string
+     */
+    private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
+        list($realPrincipalUri, ) = \Sabre\Uri\split($principalUri);
+        return $realPrincipalUri;
+    }
 }

apps/dav/lib/RootCollection.php

Indentation +125 added lines, -125 removed lines

@@ -43,130 +43,130 @@
 
 class RootCollection extends SimpleCollection {
 
-	public function __construct() {
-		$config = \OC::$server->getConfig();
-		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->getLogger();
-		$userManager = \OC::$server->getUserManager();
-		$userSession = \OC::$server->getUserSession();
-		$groupManager = \OC::$server->getGroupManager();
-		$shareManager = \OC::$server->getShareManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$proxyMapper = \OC::$server->query(ProxyMapper::class);
-
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			$shareManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
-			$proxyMapper
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $l10n);
-		$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);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
-		$publicCalendarRoot->disableListing = $disableListing;
-
-		$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()
-		);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			$userManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getLogger()
-		);
-
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, '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,
-				$commentsCollection,
-				$uploadCollection,
-				$avatarCollection,
-				new SimpleCollection('provisioning', [
-					$appleProvisioning
-				])
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $config = \OC::$server->getConfig();
+        $l10n = \OC::$server->getL10N('dav');
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->getLogger();
+        $userManager = \OC::$server->getUserManager();
+        $userSession = \OC::$server->getUserSession();
+        $groupManager = \OC::$server->getGroupManager();
+        $shareManager = \OC::$server->getShareManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $proxyMapper = \OC::$server->query(ProxyMapper::class);
+
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            $shareManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getAppManager(),
+            $proxyMapper
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $l10n);
+        $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);
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
+        $publicCalendarRoot->disableListing = $disableListing;
+
+        $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()
+        );
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            $userManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            \OC::$server->getLogger()
+        );
+
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, '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,
+                $commentsCollection,
+                $uploadCollection,
+                $avatarCollection,
+                new SimpleCollection('provisioning', [
+                    $appleProvisioning
+                ])
+        ];
+
+        parent::__construct('root', $children);
+    }
 
 }

apps/dav/appinfo/v1/caldav.php

Indentation +17 added lines, -17 removed lines

@@ -34,21 +34,21 @@ 
 use OCA\DAV\Connector\Sabre\Principal;
 
 $authBackend = new Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $principalBackend = new Principal(
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getAppManager(),
-	\OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
-	'principals/'
+    \OC::$server->getUserManager(),
+    \OC::$server->getGroupManager(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getAppManager(),
+    \OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
+    'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $userManager = \OC::$server->getUserManager();
@@ -68,8 +68,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = array(
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 );
 
 // Fire up server
@@ -85,7 +85,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
@@ -93,7 +93,7 @@ 
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
 
 if ($sendInvitations) {
-	$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+    $server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));
 

apps/dav/appinfo/v1/carddav.php

Indentation +18 added lines, -18 removed lines

@@ -35,21 +35,21 @@ 
 use Sabre\CardDAV\Plugin;
 
 $authBackend = new Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $principalBackend = new Principal(
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getAppManager(),
-	\OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
-	'principals/'
+    \OC::$server->getUserManager(),
+    \OC::$server->getGroupManager(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getAppManager(),
+    \OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
+    'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $cardDavBackend = new CardDavBackend($db, $principalBackend, \OC::$server->getUserManager(), \OC::$server->getGroupManager(), \OC::$server->getEventDispatcher());
@@ -64,8 +64,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = array(
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 );
 
 // Fire up server
@@ -80,14 +80,14 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
 $server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\PhotoCache(
-	\OC::$server->getAppDataDir('dav-photocache'),
-	\OC::$server->getLogger()
+    \OC::$server->getAppDataDir('dav-photocache'),
+    \OC::$server->getLogger()
 )));
 $server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger()));
 

apps/files_versions/lib/AppInfo/Application.php

Indentation +55 added lines, -55 removed lines

@@ -32,70 +32,70 @@
 use OCA\Files_Versions\Capabilities;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_versions', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('files_versions', $urlParams);
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
+        $container->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function (IAppContainer $c) {
-			$server = $c->getServer();
-			return new Principal(
-				$server->getUserManager(),
-				$server->getGroupManager(),
-				$server->getShareManager(),
-				$server->getUserSession(),
-				$server->getAppManager(),
-				$server->query(ProxyMapper::class)
-			);
-		});
+        $container->registerService('principalBackend', function (IAppContainer $c) {
+            $server = $c->getServer();
+            return new Principal(
+                $server->getUserManager(),
+                $server->getGroupManager(),
+                $server->getShareManager(),
+                $server->getUserSession(),
+                $server->getAppManager(),
+                $server->query(ProxyMapper::class)
+            );
+        });
 
-		$container->registerService(IVersionManager::class, function(IAppContainer $c) {
-			return new VersionManager();
-		});
+        $container->registerService(IVersionManager::class, function(IAppContainer $c) {
+            return new VersionManager();
+        });
 
-		$this->registerVersionBackends();
-	}
+        $this->registerVersionBackends();
+    }
 
-	public function registerVersionBackends() {
-		$server = $this->getContainer()->getServer();
-		$appManager = $server->getAppManager();
-		foreach($appManager->getInstalledApps() as $app) {
-			$appInfo = $appManager->getAppInfo($app);
-			if (isset($appInfo['versions'])) {
-				$backends = $appInfo['versions'];
-				foreach($backends as $backend) {
-					if (isset($backend['@value'])) {
-						$this->loadBackend($backend);
-					} else {
-						foreach ($backend as $singleBackend) {
-							$this->loadBackend($singleBackend);
-						}
-					}
-				}
-			}
-		}
-	}
+    public function registerVersionBackends() {
+        $server = $this->getContainer()->getServer();
+        $appManager = $server->getAppManager();
+        foreach($appManager->getInstalledApps() as $app) {
+            $appInfo = $appManager->getAppInfo($app);
+            if (isset($appInfo['versions'])) {
+                $backends = $appInfo['versions'];
+                foreach($backends as $backend) {
+                    if (isset($backend['@value'])) {
+                        $this->loadBackend($backend);
+                    } else {
+                        foreach ($backend as $singleBackend) {
+                            $this->loadBackend($singleBackend);
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	private function loadBackend(array $backend) {
-		$server = $this->getContainer()->getServer();
-		$logger = $server->getLogger();
-		/** @var IVersionManager $versionManager */
-		$versionManager = $this->getContainer()->getServer()->query(IVersionManager::class);
-		$class = $backend['@value'];
-		$for = $backend['@attributes']['for'];
-		try {
-			$backendObject = $server->query($class);
-			$versionManager->registerBackend($for, $backendObject);
-		} catch (\Exception $e) {
-			$logger->logException($e);
-		}
-	}
+    private function loadBackend(array $backend) {
+        $server = $this->getContainer()->getServer();
+        $logger = $server->getLogger();
+        /** @var IVersionManager $versionManager */
+        $versionManager = $this->getContainer()->getServer()->query(IVersionManager::class);
+        $class = $backend['@value'];
+        $for = $backend['@attributes']['for'];
+        try {
+            $backendObject = $server->query($class);
+            $versionManager->registerBackend($for, $backendObject);
+        } catch (\Exception $e) {
+            $logger->logException($e);
+        }
+    }
 }

apps/files_trashbin/lib/AppInfo/Application.php

Indentation +51 added lines, -51 removed lines

@@ -34,68 +34,68 @@
 use OCA\Files_Trashbin\Capabilities;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
-		parent::__construct('files_trashbin', $urlParams);
+    public function __construct (array $urlParams = []) {
+        parent::__construct('files_trashbin', $urlParams);
 
-		$container = $this->getContainer();
-		/*
+        $container = $this->getContainer();
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
+        $container->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerService('Expiration', function($c) {
-			return  new Expiration(
-				$c->query('ServerContainer')->getConfig(),
-				$c->query(ITimeFactory::class)
-			);
-		});
+        $container->registerService('Expiration', function($c) {
+            return  new Expiration(
+                $c->query('ServerContainer')->getConfig(),
+                $c->query(ITimeFactory::class)
+            );
+        });
 
-		/*
+        /*
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function () {
-			return new Principal(
-				\OC::$server->getUserManager(),
-				\OC::$server->getGroupManager(),
-				\OC::$server->getShareManager(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getAppManager(),
-				\OC::$server->query(ProxyMapper::class)
-			);
-		});
+        $container->registerService('principalBackend', function () {
+            return new Principal(
+                \OC::$server->getUserManager(),
+                \OC::$server->getGroupManager(),
+                \OC::$server->getShareManager(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getAppManager(),
+                \OC::$server->query(ProxyMapper::class)
+            );
+        });
 
-		$container->registerService(ITrashManager::class, function(IAppContainer $c) {
-			return new TrashManager();
-		});
+        $container->registerService(ITrashManager::class, function(IAppContainer $c) {
+            return new TrashManager();
+        });
 
-		$this->registerTrashBackends();
-	}
+        $this->registerTrashBackends();
+    }
 
-	public function registerTrashBackends() {
-		$server = $this->getContainer()->getServer();
-		$logger = $server->getLogger();
-		$appManager = $server->getAppManager();
-		/** @var ITrashManager $trashManager */
-		$trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
-		foreach($appManager->getInstalledApps() as $app) {
-			$appInfo = $appManager->getAppInfo($app);
-			if (isset($appInfo['trash'])) {
-				$backends = $appInfo['trash'];
-				foreach($backends as $backend) {
-					$class = $backend['@value'];
-					$for = $backend['@attributes']['for'];
+    public function registerTrashBackends() {
+        $server = $this->getContainer()->getServer();
+        $logger = $server->getLogger();
+        $appManager = $server->getAppManager();
+        /** @var ITrashManager $trashManager */
+        $trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
+        foreach($appManager->getInstalledApps() as $app) {
+            $appInfo = $appManager->getAppInfo($app);
+            if (isset($appInfo['trash'])) {
+                $backends = $appInfo['trash'];
+                foreach($backends as $backend) {
+                    $class = $backend['@value'];
+                    $for = $backend['@attributes']['for'];
 
-					try {
-						$backendObject = $server->query($class);
-						$trashManager->registerBackend($for, $backendObject);
-					} catch (\Exception $e) {
-						$logger->logException($e);
-					}
-				}
-			}
-		}
-	}
+                    try {
+                        $backendObject = $server->query($class);
+                        $trashManager->registerBackend($for, $backendObject);
+                    } catch (\Exception $e) {
+                        $logger->logException($e);
+                    }
+                }
+            }
+        }
+    }
 }