nextcloud / server

apps/dav/lib/RootCollection.php

Indentation +113 added lines, -113 removed lines

@@ -39,118 +39,118 @@
 
 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();
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			$shareManager,
-			\OC::$server->getUserSession(),
-			$config
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger);
-		// 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');
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$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
-		];
-
-		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();
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            $shareManager,
+            \OC::$server->getUserSession(),
+            $config
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger);
+        // 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');
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $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
+        ];
+
+        parent::__construct('root', $children);
+    }
 
 }

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Indentation +326 added lines, -326 removed lines

@@ -32,330 +32,330 @@
 
 abstract class AbstractPrincipalBackend implements BackendInterface {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var string */
-	private $dbTableName;
-
-	/**
-	 * @param IDBConnection $dbConnection
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param ILogger $logger
-	 * @param string $principalPrefix
-	 * @param string $dbPrefix
-	 */
-	public function __construct(IDBConnection $dbConnection,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								ILogger $logger,
-								$principalPrefix, $dbPrefix) {
-		$this->db = $dbConnection;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->logger = $logger;
-		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . '_cache';
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-				->from($this->dbTableName);
-			$stmt = $query->execute();
-
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-				$principals[] = $this->rowToPrincipal($row);
-			}
-
-			$stmt->closeCursor();
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		if (strpos($path, $this->principalPrefix) !== 0) {
-			return null;
-		}
-		list(, $name) = \Sabre\Uri\split($path);
-
-		list($backendId, $resourceId) = explode('-',  $name, 2);
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) {
-			return null;
-		}
-
-		return $this->rowToPrincipal($row);
-	}
-
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 */
-	public function getGroupMemberSet($principal) {
-		return [];
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	public function getGroupMembership($principal) {
-		return [];
-	}
-
-	/**
-	 * 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) {
-		throw new Exception('Setting members of the group is not supported yet');
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		$results = [];
-		if (\count($searchProperties) === 0) {
-			return [];
-		}
-		if ($prefixPath !== $this->principalPrefix) {
-			return [];
-		}
-
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return [];
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{DAV:}displayname':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				default:
-					$results[] = [];
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return null|string
-	 */
-	function findByUri($uri, $principalPrefix) {
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return null;
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		if (strpos($uri, 'mailto:') === 0) {
-			$email = substr($uri, 7);
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('email', $query->createNamedParameter($email)));
-
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if(!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		if (strpos($uri, 'principal:') === 0) {
-			$path = substr($uri, 10);
-			if (strpos($path, $this->principalPrefix) !== 0) {
-				return null;
-			}
-
-			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-				->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if(!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * convert database row to principal
-	 */
-	private function rowToPrincipal($row) {
-		return [
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{http://sabredav.org/ns}email-address' => $row['email']
-		];
-	}
-
-	/**
-	 * @param $row
-	 * @param $userGroups
-	 * @return bool
-	 */
-	private function isAllowedToAccessResource($row, $userGroups) {
-		if (!isset($row['group_restrictions']) ||
-			$row['group_restrictions'] === null ||
-			$row['group_restrictions'] === '') {
-			return true;
-		}
-
-		// group restrictions contains something, but not parsable, deny access and log warning
-		$json = json_decode($row['group_restrictions']);
-		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
-			return false;
-		}
-
-		// empty array => no group restrictions
-		if (empty($json)) {
-			return true;
-		}
-
-		return !empty(array_intersect($json, $userGroups));
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var string */
+    private $dbTableName;
+
+    /**
+     * @param IDBConnection $dbConnection
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param ILogger $logger
+     * @param string $principalPrefix
+     * @param string $dbPrefix
+     */
+    public function __construct(IDBConnection $dbConnection,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                ILogger $logger,
+                                $principalPrefix, $dbPrefix) {
+        $this->db = $dbConnection;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->logger = $logger;
+        $this->principalPrefix = $principalPrefix;
+        $this->dbTableName = 'calendar_' . $dbPrefix . '_cache';
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+                ->from($this->dbTableName);
+            $stmt = $query->execute();
+
+            while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                $principals[] = $this->rowToPrincipal($row);
+            }
+
+            $stmt->closeCursor();
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        if (strpos($path, $this->principalPrefix) !== 0) {
+            return null;
+        }
+        list(, $name) = \Sabre\Uri\split($path);
+
+        list($backendId, $resourceId) = explode('-',  $name, 2);
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) {
+            return null;
+        }
+
+        return $this->rowToPrincipal($row);
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     */
+    public function getGroupMemberSet($principal) {
+        return [];
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     */
+    public function getGroupMembership($principal) {
+        return [];
+    }
+
+    /**
+     * 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) {
+        throw new Exception('Setting members of the group is not supported yet');
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        $results = [];
+        if (\count($searchProperties) === 0) {
+            return [];
+        }
+        if ($prefixPath !== $this->principalPrefix) {
+            return [];
+        }
+
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return [];
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{DAV:}displayname':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                default:
+                    $results[] = [];
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return null|string
+     */
+    function findByUri($uri, $principalPrefix) {
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return null;
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        if (strpos($uri, 'mailto:') === 0) {
+            $email = substr($uri, 7);
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('email', $query->createNamedParameter($email)));
+
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if(!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        if (strpos($uri, 'principal:') === 0) {
+            $path = substr($uri, 10);
+            if (strpos($path, $this->principalPrefix) !== 0) {
+                return null;
+            }
+
+            list(, $name) = \Sabre\Uri\split($path);
+            list($backendId, $resourceId) = explode('-',  $name, 2);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+                ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if(!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        return null;
+    }
+
+    /**
+     * convert database row to principal
+     */
+    private function rowToPrincipal($row) {
+        return [
+            'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{http://sabredav.org/ns}email-address' => $row['email']
+        ];
+    }
+
+    /**
+     * @param $row
+     * @param $userGroups
+     * @return bool
+     */
+    private function isAllowedToAccessResource($row, $userGroups) {
+        if (!isset($row['group_restrictions']) ||
+            $row['group_restrictions'] === null ||
+            $row['group_restrictions'] === '') {
+            return true;
+        }
+
+        // group restrictions contains something, but not parsable, deny access and log warning
+        $json = json_decode($row['group_restrictions']);
+        if (!\is_array($json)) {
+            $this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+            return false;
+        }
+
+        // empty array => no group restrictions
+        if (empty($json)) {
+            return true;
+        }
+
+        return !empty(array_intersect($json, $userGroups));
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
 		$this->groupManager = $groupManager;
 		$this->logger = $logger;
 		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . '_cache';
+		$this->dbTableName = 'calendar_'.$dbPrefix.'_cache';
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 				->from($this->dbTableName);
 			$stmt = $query->execute();
 
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 				$principals[] = $this->rowToPrincipal($row);
 			}
 
@@ -117,7 +117,7 @@ 
 		}
 		list(, $name) = \Sabre\Uri\split($path);
 
-		list($backendId, $resourceId) = explode('-',  $name, 2);
+		list($backendId, $resourceId) = explode('-', $name, 2);
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@@ -127,7 +127,7 @@ 
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -203,11 +203,11 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('email', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
 							continue;
 						}
@@ -222,11 +222,11 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
 							continue;
 						}
@@ -281,7 +281,7 @@ 
 			$stmt = $query->execute();
 			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-			if(!$row) {
+			if (!$row) {
 				return null;
 			}
 			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -298,7 +298,7 @@ 
 			}
 
 			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
+			list($backendId, $resourceId) = explode('-', $name, 2);
 
 			$query = $this->db->getQueryBuilder();
 			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
@@ -308,7 +308,7 @@ 
 			$stmt = $query->execute();
 			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-			if(!$row) {
+			if (!$row) {
 				return null;
 			}
 			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -326,7 +326,7 @@ 
 	 */
 	private function rowToPrincipal($row) {
 		return [
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+			'uri' => $this->principalPrefix.'/'.$row['backend_id'].'-'.$row['resource_id'],
 			'{DAV:}displayname' => $row['displayname'],
 			'{http://sabredav.org/ns}email-address' => $row['email']
 		];
@@ -347,7 +347,7 @@ 
 		// group restrictions contains something, but not parsable, deny access and log warning
 		$json = json_decode($row['group_restrictions']);
 		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+			$this->logger->info('group_restrictions field could not be parsed for '.$this->dbTableName.'::'.$row['id'].', denying access to resource');
 			return false;
 		}
 

apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php

Indentation +13 added lines, -13 removed lines

@@ -29,17 +29,17 @@
 
 class ResourcePrincipalBackend extends AbstractPrincipalBackend {
 
-	/**
-	 * @param IDBConnection $dbConnection
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $dbConnection,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								ILogger $logger) {
-		parent::__construct($dbConnection, $userSession, $groupManager, $logger,
-			'principals/calendar-resources', 'resources');
-	}
+    /**
+     * @param IDBConnection $dbConnection
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $dbConnection,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                ILogger $logger) {
+        parent::__construct($dbConnection, $userSession, $groupManager, $logger,
+            'principals/calendar-resources', 'resources');
+    }
 }

apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php

Indentation +13 added lines, -13 removed lines

@@ -29,17 +29,17 @@
 
 class RoomPrincipalBackend extends AbstractPrincipalBackend {
 
-	/**
-	 * @param IDBConnection $dbConnection
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $dbConnection,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								ILogger $logger) {
-		parent::__construct($dbConnection, $userSession, $groupManager, $logger,
-			'principals/calendar-rooms', 'rooms');
-	}
+    /**
+     * @param IDBConnection $dbConnection
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $dbConnection,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                ILogger $logger) {
+        parent::__construct($dbConnection, $userSession, $groupManager, $logger,
+            'principals/calendar-rooms', 'rooms');
+    }
 }

apps/dav/lib/CalDAV/Schedule/Plugin.php

Indentation +139 added lines, -139 removed lines

@@ -38,143 +38,143 @@
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
-	/**
-	 * Initializes the plugin
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		parent::initialize($server);
-		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	protected function getAddressesForPrincipal($principal) {
-		$result = parent::getAddressesForPrincipal($principal);
-
-		if ($result === null) {
-			$result = [];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Always use the personal calendar as target for scheduled events
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
-				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
-				$caldavPlugin = $this->server->getPlugin('caldav');
-				$principalUrl = $node->getPrincipalUrl();
-
-				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-				if (!$calendarHomePath) {
-					return null;
-				}
-
-				if (strpos($principalUrl, 'principals/users') === 0) {
-					$uri = CalDavBackend::PERSONAL_CALENDAR_URI;
-					$displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
-				} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
-						  strpos($principalUrl, 'principals/calendar-rooms') === 0) {
-					$uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
-					$displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
-				} else {
-					// How did we end up here?
-					// TODO - throw exception or just ignore?
-					return null;
-				}
-
-				/** @var CalendarHome $calendarHome */
-				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-				if (!$calendarHome->childExists($uri)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
-						'{DAV:}displayname' => $displayname,
-					]);
-				}
-
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
-				if (empty($result)) {
-					return null;
-				}
-
-				return new LocalHref($result[0]['href']);
-			});
-		}
-	}
-
-	/**
-	 * This method is triggered whenever there was a calendar object gets
-	 * created or updated.
-	 *
-	 * Basically just a copy of parent::calendarObjectChange, with the change
-	 * from:
-	 * $addresses = $this->getAddressesForPrincipal($calendarNode->getOwner());
-	 * to:
-	 * $addresses = $this->getAddressesForPrincipal($calendarNode->getPrincipalURI());
-	 *
-	 * @param RequestInterface $request HTTP request
-	 * @param ResponseInterface $response HTTP Response
-	 * @param VCalendar $vCal Parsed iCalendar object
-	 * @param mixed $calendarPath Path to calendar collection
-	 * @param mixed $modified The iCalendar object has been touched.
-	 * @param mixed $isNew Whether this was a new item or we're updating one
-	 * @return void
-	 */
-	function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
-
-		if (!$this->scheduleReply($this->server->httpRequest)) {
-			return;
-		}
-
-		$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
-
-		$addresses = $this->getAddressesForPrincipal(
-			$calendarNode->getPrincipalURI()
-		);
-
-		if (!$isNew) {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-			$oldObj = Reader::read($node->get());
-		} else {
-			$oldObj = null;
-		}
-
-		$this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
-
-		if ($oldObj) {
-			// Destroy circular references so PHP will GC the object.
-			$oldObj->destroy();
-		}
-
-	}
-
-	/**
-	 * This method checks the 'Schedule-Reply' header
-	 * and returns false if it's 'F', otherwise true.
-	 *
-	 * Copied from Sabre/DAV's Schedule plugin, because it's
-	 * private for whatever reason
-	 *
-	 * @param RequestInterface $request
-	 * @return bool
-	 */
-	private function scheduleReply(RequestInterface $request) {
-
-		$scheduleReply = $request->getHeader('Schedule-Reply');
-		return $scheduleReply !== 'F';
-
-	}
+    /**
+     * Initializes the plugin
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        parent::initialize($server);
+        $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return array
+     */
+    protected function getAddressesForPrincipal($principal) {
+        $result = parent::getAddressesForPrincipal($principal);
+
+        if ($result === null) {
+            $result = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Always use the personal calendar as target for scheduled events
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
+                /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+                $caldavPlugin = $this->server->getPlugin('caldav');
+                $principalUrl = $node->getPrincipalUrl();
+
+                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                if (!$calendarHomePath) {
+                    return null;
+                }
+
+                if (strpos($principalUrl, 'principals/users') === 0) {
+                    $uri = CalDavBackend::PERSONAL_CALENDAR_URI;
+                    $displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
+                } elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
+                          strpos($principalUrl, 'principals/calendar-rooms') === 0) {
+                    $uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
+                    $displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
+                } else {
+                    // How did we end up here?
+                    // TODO - throw exception or just ignore?
+                    return null;
+                }
+
+                /** @var CalendarHome $calendarHome */
+                $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+                if (!$calendarHome->childExists($uri)) {
+                    $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
+                        '{DAV:}displayname' => $displayname,
+                    ]);
+                }
+
+                $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+                if (empty($result)) {
+                    return null;
+                }
+
+                return new LocalHref($result[0]['href']);
+            });
+        }
+    }
+
+    /**
+     * This method is triggered whenever there was a calendar object gets
+     * created or updated.
+     *
+     * Basically just a copy of parent::calendarObjectChange, with the change
+     * from:
+     * $addresses = $this->getAddressesForPrincipal($calendarNode->getOwner());
+     * to:
+     * $addresses = $this->getAddressesForPrincipal($calendarNode->getPrincipalURI());
+     *
+     * @param RequestInterface $request HTTP request
+     * @param ResponseInterface $response HTTP Response
+     * @param VCalendar $vCal Parsed iCalendar object
+     * @param mixed $calendarPath Path to calendar collection
+     * @param mixed $modified The iCalendar object has been touched.
+     * @param mixed $isNew Whether this was a new item or we're updating one
+     * @return void
+     */
+    function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
+
+        if (!$this->scheduleReply($this->server->httpRequest)) {
+            return;
+        }
+
+        $calendarNode = $this->server->tree->getNodeForPath($calendarPath);
+
+        $addresses = $this->getAddressesForPrincipal(
+            $calendarNode->getPrincipalURI()
+        );
+
+        if (!$isNew) {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+            $oldObj = Reader::read($node->get());
+        } else {
+            $oldObj = null;
+        }
+
+        $this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
+
+        if ($oldObj) {
+            // Destroy circular references so PHP will GC the object.
+            $oldObj->destroy();
+        }
+
+    }
+
+    /**
+     * This method checks the 'Schedule-Reply' header
+     * and returns false if it's 'F', otherwise true.
+     *
+     * Copied from Sabre/DAV's Schedule plugin, because it's
+     * private for whatever reason
+     *
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function scheduleReply(RequestInterface $request) {
+
+        $scheduleReply = $request->getHeader('Schedule-Reply');
+        return $scheduleReply !== 'F';
+
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
+			$propFind->handle('{'.self::NS_CALDAV.'}schedule-default-calendar-URL', function() use ($node) {
 				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
 				$caldavPlugin = $this->server->getPlugin('caldav');
 				$principalUrl = $node->getPrincipalUrl();
@@ -105,7 +105,7 @@ 
 					]);
 				}
 
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+				$result = $this->server->getPropertiesForPath($calendarHomePath.'/'.$uri, [], 1);
 				if (empty($result)) {
 					return null;
 				}

apps/dav/lib/CalDAV/Plugin.php

Indentation +19 added lines, -19 removed lines

@@ -25,27 +25,27 @@
 
 class Plugin extends \Sabre\CalDAV\Plugin {
 
-	const SYSTEM_CALENDAR_ROOT = 'system-calendars';
+    const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
-	/**
-	 * @inheritdoc
-	 */
-	function getCalendarHomeForPrincipal($principalUrl):string {
+    /**
+     * @inheritdoc
+     */
+    function getCalendarHomeForPrincipal($principalUrl):string {
 
-		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
-		}
+        if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principalUrl);
+            return self::CALENDAR_ROOT . '/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+        }
 
-		throw new \LogicException('This is not supposed to happen');
-	}
+        throw new \LogicException('This is not supposed to happen');
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -34,15 +34,15 @@
 
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
+			return self::CALENDAR_ROOT.'/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-resources/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-rooms/'.$principalId;
 		}
 
 		throw new \LogicException('This is not supposed to happen');

apps/dav/lib/Migration/Version1005Date20180530124431.php

Indentation +48 added lines, -48 removed lines

@@ -32,56 +32,56 @@
  */
 class Version1005Date20180530124431 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$types = ['resources', 'rooms'];
-		foreach($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type . '_cache')) {
-				$table = $schema->createTable('calendar_' . $type . '_cache');
+        $types = ['resources', 'rooms'];
+        foreach($types as $type) {
+            if (!$schema->hasTable('calendar_' . $type . '_cache')) {
+                $table = $schema->createTable('calendar_' . $type . '_cache');
 
-				$table->addColumn('id', Type::BIGINT, [
-					'autoincrement' => true,
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn('backend_id', Type::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table->addColumn('resource_id', Type::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table->addColumn('email', Type::STRING, [
-					'notnull' => false,
-					'length' => 255,
-				]);
-				$table->addColumn('displayname', Type::STRING, [
-					'notnull' => false,
-					'length' => 255,
-				]);
-				$table->addColumn('group_restrictions', Type::STRING, [
-					'notnull' => false,
-					'length' => 4000,
-				]);
+                $table->addColumn('id', Type::BIGINT, [
+                    'autoincrement' => true,
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn('backend_id', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table->addColumn('resource_id', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table->addColumn('email', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+                $table->addColumn('displayname', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+                $table->addColumn('group_restrictions', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 4000,
+                ]);
 
-				$table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
-				$table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
-			}
-		}
+                $table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
+                $table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
+                $table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
+                $table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -44,9 +44,9 @@ 
 		$schema = $schemaClosure();
 
 		$types = ['resources', 'rooms'];
-		foreach($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type . '_cache')) {
-				$table = $schema->createTable('calendar_' . $type . '_cache');
+		foreach ($types as $type) {
+			if (!$schema->hasTable('calendar_'.$type.'_cache')) {
+				$table = $schema->createTable('calendar_'.$type.'_cache');
 
 				$table->addColumn('id', Type::BIGINT, [
 					'autoincrement' => true,
@@ -75,10 +75,10 @@ 
 					'length' => 4000,
 				]);
 
-				$table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
-				$table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
+				$table->setPrimaryKey(['id'], 'calendar_'.$type.'_cache_id_idx');
+				$table->addIndex(['backend_id', 'resource_id'], 'calendar_'.$type.'_cache_backendresource_idx');
+				$table->addIndex(['email'], 'calendar_'.$type.'_cache_email_idx');
+				$table->addIndex(['displayname'], 'calendar_'.$type.'_cache_displayname_idx');
 			}
 		}
 

lib/public/Calendar/Resource/IResource.php

Indentation +42 added lines, -42 removed lines

@@ -31,50 +31,50 @@
  */
 interface IResource {
 
-	/**
-	 * get the resource id
-	 *
-	 * This id has to be unique within the backend
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getId():string;
+    /**
+     * get the resource id
+     *
+     * This id has to be unique within the backend
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getId():string;
 
-	/**
-	 * get the display name for a resource
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getDisplayName():string;
+    /**
+     * get the display name for a resource
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getDisplayName():string;
 
-	/**
-	 * Get a list of groupIds that are allowed to access this resource
-	 *
-	 * If an empty array is returned, no group restrictions are
-	 * applied.
-	 *
-	 * @return string[]
-	 * @since 14.0.0
-	 */
-	public function getGroupRestrictions():array;
+    /**
+     * Get a list of groupIds that are allowed to access this resource
+     *
+     * If an empty array is returned, no group restrictions are
+     * applied.
+     *
+     * @return string[]
+     * @since 14.0.0
+     */
+    public function getGroupRestrictions():array;
 
-	/**
-	 * get email-address for resource
-	 *
-	 * The email address has to be globally unique
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getEMail():string;
+    /**
+     * get email-address for resource
+     *
+     * The email address has to be globally unique
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getEMail():string;
 
-	/**
-	 * Get corresponding backend object
-	 *
-	 * @return IBackend
-	 * @since 14.0.0
-	 */
-	public function getBackend():IBackend;
+    /**
+     * Get corresponding backend object
+     *
+     * @return IBackend
+     * @since 14.0.0
+     */
+    public function getBackend():IBackend;
 }

lib/public/Calendar/Room/IRoom.php

Indentation +42 added lines, -42 removed lines

@@ -31,50 +31,50 @@
  */
 interface IRoom {
 
-	/**
-	 * get the room id
-	 *
-	 * This id has to be unique within the backend
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getId():string;
+    /**
+     * get the room id
+     *
+     * This id has to be unique within the backend
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getId():string;
 
-	/**
-	 * get the display name for a room
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getDisplayName():string;
+    /**
+     * get the display name for a room
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getDisplayName():string;
 
-	/**
-	 * Get a list of groupIds that are allowed to access this room
-	 *
-	 * If an empty array is returned, no group restrictions are
-	 * applied.
-	 *
-	 * @return string[]
-	 * @since 14.0.0
-	 */
-	public function getGroupRestrictions():array;
+    /**
+     * Get a list of groupIds that are allowed to access this room
+     *
+     * If an empty array is returned, no group restrictions are
+     * applied.
+     *
+     * @return string[]
+     * @since 14.0.0
+     */
+    public function getGroupRestrictions():array;
 
-	/**
-	 * get email-address for room
-	 *
-	 * The email address has to be globally unique
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getEMail():string;
+    /**
+     * get email-address for room
+     *
+     * The email address has to be globally unique
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getEMail():string;
 
-	/**
-	 * Get corresponding backend object
-	 *
-	 * @return IBackend
-	 * @since 14.0.0
-	 */
-	public function getBackend():IBackend;
+    /**
+     * Get corresponding backend object
+     *
+     * @return IBackend
+     * @since 14.0.0
+     */
+    public function getBackend():IBackend;
 }