nextcloud / server

lib/private/AppFramework/Bootstrap/ServiceRegistration.php

Indentation +18 added lines, -18 removed lines

@@ -30,24 +30,24 @@
  * @template T
  */
 class ServiceRegistration extends ARegistration {
-	/**
-	 * @var string
-	 * @psalm-var class-string<T>
-	 */
-	private $service;
+    /**
+     * @var string
+     * @psalm-var class-string<T>
+     */
+    private $service;
 
-	/**
-	 * @psalm-param class-string<T> $service
-	 */
-	public function __construct(string $appId, string $service) {
-		parent::__construct($appId);
-		$this->service = $service;
-	}
+    /**
+     * @psalm-param class-string<T> $service
+     */
+    public function __construct(string $appId, string $service) {
+        parent::__construct($appId);
+        $this->service = $service;
+    }
 
-	/**
-	 * @psalm-return class-string<T>
-	 */
-	public function getService(): string {
-		return $this->service;
-	}
+    /**
+     * @psalm-return class-string<T>
+     */
+    public function getService(): string {
+        return $this->service;
+    }
 }

lib/private/Preview/WebP.php

Indentation +9 added lines, -9 removed lines

@@ -29,14 +29,14 @@
 use OCP\Files\FileInfo;
 
 class WebP extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/webp/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/webp/';
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)(imagetypes() & IMG_WEBP);
+    }
 }

lib/public/Files/Cache/AbstractCacheEvent.php

Indentation +51 added lines, -51 removed lines

@@ -35,61 +35,61 @@
  * @since 22.0.0
  */
 class AbstractCacheEvent extends Event implements ICacheEvent {
-	protected $storage;
-	protected $path;
-	protected $fileId;
-	protected $storageId;
+    protected $storage;
+    protected $path;
+    protected $fileId;
+    protected $storageId;
 
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param int $fileId
-	 * @since 22.0.0
-	 */
-	public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
-		$this->storage = $storage;
-		$this->path = $path;
-		$this->fileId = $fileId;
-		$this->storageId = $storageId;
-	}
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param int $fileId
+     * @since 22.0.0
+     */
+    public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
+        $this->storage = $storage;
+        $this->path = $path;
+        $this->fileId = $fileId;
+        $this->storageId = $storageId;
+    }
 
-	/**
-	 * @return IStorage
-	 * @since 22.0.0
-	 */
-	public function getStorage(): IStorage {
-		return $this->storage;
-	}
+    /**
+     * @return IStorage
+     * @since 22.0.0
+     */
+    public function getStorage(): IStorage {
+        return $this->storage;
+    }
 
-	/**
-	 * @return string
-	 * @since 22.0.0
-	 */
-	public function getPath(): string {
-		return $this->path;
-	}
+    /**
+     * @return string
+     * @since 22.0.0
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
 
-	/**
-	 * @param string $path
-	 * @since 22.0.0
-	 */
-	public function setPath(string $path): void {
-		$this->path = $path;
-	}
+    /**
+     * @param string $path
+     * @since 22.0.0
+     */
+    public function setPath(string $path): void {
+        $this->path = $path;
+    }
 
-	/**
-	 * @return int
-	 * @since 22.0.0
-	 */
-	public function getFileId(): int {
-		return $this->fileId;
-	}
+    /**
+     * @return int
+     * @since 22.0.0
+     */
+    public function getFileId(): int {
+        return $this->fileId;
+    }
 
-	/**
-	 * @return int
-	 * @since 22.0.0
-	 */
-	public function getStorageId(): int {
-		return $this->storageId;
-	}
+    /**
+     * @return int
+     * @since 22.0.0
+     */
+    public function getStorageId(): int {
+        return $this->storageId;
+    }
 }

apps/dav/lib/Migration/Version1011Date20190806104428.php

Indentation +34 added lines, -34 removed lines

@@ -38,41 +38,41 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version1011Date20190806104428 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	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
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable('dav_cal_proxy');
-		$table->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 11,
-			'unsigned' => true,
-		]);
-		$table->addColumn('owner_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('proxy_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('permissions', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
+        $table = $schema->createTable('dav_cal_proxy');
+        $table->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('owner_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('proxy_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('permissions', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
 
-		$table->setPrimaryKey(['id']);
-		$table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx');
-		$table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid');
+        $table->setPrimaryKey(['id']);
+        $table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx');
+        $table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1017Date20210216083742.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version1017Date20210216083742 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('dav_cal_proxy');
-		if ($table->hasIndex('dav_cal_proxy_ioid')) {
-			$table->dropIndex('dav_cal_proxy_ioid');
-		}
+        $table = $schema->getTable('dav_cal_proxy');
+        if ($table->hasIndex('dav_cal_proxy_ioid')) {
+            $table->dropIndex('dav_cal_proxy_ioid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/files_sharing/lib/Migration/Version22000Date20210216084241.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version22000Date20210216084241 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('share_external');
-		if ($table->hasIndex('sh_external_user')) {
-			$table->dropIndex('sh_external_user');
-		}
+        $table = $schema->getTable('share_external');
+        if ($table->hasIndex('sh_external_user')) {
+            $table->dropIndex('sh_external_user');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/CardDAV/Plugin.php

Indentation +39 added lines, -39 removed lines

@@ -31,46 +31,46 @@
 use Sabre\DAV\Server;
 
 class Plugin extends \Sabre\CardDAV\Plugin {
-	public function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-		parent::initialize($server);
-	}
+    public function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+        parent::initialize($server);
+    }
 
-	/**
-	 * Returns the addressbook home for a given principal
-	 *
-	 * @param string $principal
-	 * @return string|null
-	 */
-	protected function getAddressbookHomeForPrincipal($principal) {
-		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
-		}
-	}
+    /**
+     * Returns the addressbook home for a given principal
+     *
+     * @param string $principal
+     * @return string|null
+     */
+    protected function getAddressbookHomeForPrincipal($principal) {
+        if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+        }
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$ns = '{http://owncloud.org/ns}';
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $ns = '{http://owncloud.org/ns}';
 
-		if ($node instanceof AddressBook) {
-			$propFind->handle($ns . 'groups', function () use ($node) {
-				return new Groups($node->getContactsGroups());
-			});
-		}
-	}
+        if ($node instanceof AddressBook) {
+            $propFind->handle($ns . 'groups', function () use ($node) {
+                return new Groups($node->getContactsGroups());
+            });
+        }
+    }
 }

apps/dav/lib/Traits/PrincipalProxyTrait.php

Indentation +186 added lines, -186 removed lines

@@ -36,190 +36,190 @@
  */
 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) {
-		[$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) {
-		[$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;
-		}
-
-		[$prefix, $owner] = \Sabre\Uri\split($principalUri);
-		$proxies = $this->proxyMapper->getProxiesOf($principalUri);
-
-		foreach ($members as $member) {
-			[$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 {
-		[$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
-		[$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 {
-		[, $proxy] = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-read';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isWriteProxyPrincipal(string $principalUri):bool {
-		[, $proxy] = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-write';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return string
-	 */
-	private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
-		[$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) {
+        [$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) {
+        [$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;
+        }
+
+        [$prefix, $owner] = \Sabre\Uri\split($principalUri);
+        $proxies = $this->proxyMapper->getProxiesOf($principalUri);
+
+        foreach ($members as $member) {
+            [$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 {
+        [$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
+        [$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 {
+        [, $proxy] = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-read';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isWriteProxyPrincipal(string $principalUri):bool {
+        [, $proxy] = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-write';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return string
+     */
+    private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
+        [$realPrincipalUri, ] = \Sabre\Uri\split($principalUri);
+        return $realPrincipalUri;
+    }
 }

apps/dav/lib/CalDAV/Plugin.php

Indentation +25 added lines, -25 removed lines

@@ -26,30 +26,30 @@
 namespace OCA\DAV\CalDAV;
 
 class Plugin extends \Sabre\CalDAV\Plugin {
-	public const SYSTEM_CALENDAR_ROOT = 'system-calendars';
+    public const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
-	/**
-	 * Returns the path to a principal's calendar home.
-	 *
-	 * The return url must not end with a slash.
-	 * This function should return null in case a principal did not have
-	 * a calendar home.
-	 *
-	 * @param string $principalUrl
-	 * @return string|null
-	 */
-	public function getCalendarHomeForPrincipal($principalUrl) {
-		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
-		}
-	}
+    /**
+     * Returns the path to a principal's calendar home.
+     *
+     * The return url must not end with a slash.
+     * This function should return null in case a principal did not have
+     * a calendar home.
+     *
+     * @param string $principalUrl
+     * @return string|null
+     */
+    public function getCalendarHomeForPrincipal($principalUrl) {
+        if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principalUrl);
+            return self::CALENDAR_ROOT . '/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+        }
+    }
 }