nextcloud / server

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

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	private function setupUserFs($userId) {
 		\OC_Util::setupFS($userId);
 		$this->session->close();
-		return $this->principalPrefix . $userId;
+		return $this->principalPrefix.$userId;
 	}
 
 	/**

Indentation +47 added lines, -47 removed lines

@@ -16,57 +16,57 @@
 use Sabre\HTTP\ResponseInterface;
 
 class BearerAuth extends AbstractBearer {
-	public function __construct(
-		private IUserSession $userSession,
-		private ISession $session,
-		private IRequest $request,
-		private IConfig $config,
-		private string $principalPrefix = 'principals/users/',
-	) {
-		// setup realm
-		$defaults = new Defaults();
-		$this->realm = $defaults->getName() ?: 'Nextcloud';
-	}
+    public function __construct(
+        private IUserSession $userSession,
+        private ISession $session,
+        private IRequest $request,
+        private IConfig $config,
+        private string $principalPrefix = 'principals/users/',
+    ) {
+        // setup realm
+        $defaults = new Defaults();
+        $this->realm = $defaults->getName() ?: 'Nextcloud';
+    }
 
-	private function setupUserFs($userId) {
-		\OC_Util::setupFS($userId);
-		$this->session->close();
-		return $this->principalPrefix . $userId;
-	}
+    private function setupUserFs($userId) {
+        \OC_Util::setupFS($userId);
+        $this->session->close();
+        return $this->principalPrefix . $userId;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validateBearerToken($bearerToken) {
-		\OC_Util::setupFS();
+    /**
+     * {@inheritdoc}
+     */
+    public function validateBearerToken($bearerToken) {
+        \OC_Util::setupFS();
 
-		if (!$this->userSession->isLoggedIn()) {
-			$this->userSession->tryTokenLogin($this->request);
-		}
-		if ($this->userSession->isLoggedIn()) {
-			return $this->setupUserFs($this->userSession->getUser()->getUID());
-		}
+        if (!$this->userSession->isLoggedIn()) {
+            $this->userSession->tryTokenLogin($this->request);
+        }
+        if ($this->userSession->isLoggedIn()) {
+            return $this->setupUserFs($this->userSession->getUser()->getUID());
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
-	 * header which some DAV clients can't handle. Thus we override this function
-	 * and make it simply return a 401.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response): void {
-		// Legacy ownCloud clients still authenticate via OAuth2
-		$enableOcClients = $this->config->getSystemValueBool('oauth2.enable_oc_clients', false);
-		$userAgent = $request->getHeader('User-Agent');
-		if ($enableOcClients && $userAgent !== null && str_contains($userAgent, 'mirall')) {
-			parent::challenge($request, $response);
-			return;
-		}
+    /**
+     * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
+     * header which some DAV clients can't handle. Thus we override this function
+     * and make it simply return a 401.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response): void {
+        // Legacy ownCloud clients still authenticate via OAuth2
+        $enableOcClients = $this->config->getSystemValueBool('oauth2.enable_oc_clients', false);
+        $userAgent = $request->getHeader('User-Agent');
+        if ($enableOcClients && $userAgent !== null && str_contains($userAgent, 'mirall')) {
+            parent::challenge($request, $response);
+            return;
+        }
 
-		$response->setStatus(Http::STATUS_UNAUTHORIZED);
-	}
+        $response->setStatus(Http::STATUS_UNAUTHORIZED);
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  */
 class UnsupportedMediaType extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 415;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 415;
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  */
 class EntityTooLarge extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 413;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 413;
+    }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}tag') {
 				$tags[] = $elem['value'];
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->tags as $tag) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}tag', $tag);
 		}
 	}
 }

Indentation +77 added lines, -77 removed lines

@@ -17,86 +17,86 @@
  * This property contains multiple "tag" elements, each containing a tag name.
  */
 class TagList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * @param array $tags
-	 */
-	public function __construct(
-		/**
-		 * tags
-		 */
-		private array $tags,
-	) {
-	}
+    /**
+     * @param array $tags
+     */
+    public function __construct(
+        /**
+         * tags
+         */
+        private array $tags,
+    ) {
+    }
 
-	/**
-	 * Returns the tags
-	 *
-	 * @return array
-	 */
-	public function getTags() {
-		return $this->tags;
-	}
+    /**
+     * Returns the tags
+     *
+     * @return array
+     */
+    public function getTags() {
+        return $this->tags;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statictly, this is because in theory this method
-	 * may be used as a type of constructor, or factory method.
-	 *
-	 * Often you want to return an instance of the current class, but you are
-	 * free to return other data as well.
-	 *
-	 * You are responsible for advancing the reader to the next element. Not
-	 * doing anything will result in a never-ending loop.
-	 *
-	 * If you just want to skip parsing for this element altogether, you can
-	 * just call $reader->next();
-	 *
-	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-	 * the next element.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$tags = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $tags = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
-				$tags[] = $elem['value'];
-			}
-		}
-		return new self($tags);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
+                $tags[] = $elem['value'];
+            }
+        }
+        return new self($tags);
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->tags as $tag) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->tags as $tag) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
+        }
+    }
 }

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

Spacing +1 added lines, -1 removed lines

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

Indentation +24 added lines, -24 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

Indentation +30 added lines, -30 removed lines

@@ -32,37 +32,37 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private array $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private array $checksums;
 
-	public function __construct(string $checksum) {
-		$this->checksums = explode(' ', $checksum);
-	}
+    public function __construct(string $checksum) {
+        $this->checksums = explode(' ', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -71,8 +71,8 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}share-type') {
+				$shareTypes[] = (int) $elem['value'];
 			}
 		}
 		return new self($shareTypes);
@@ -86,7 +86,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}share-type', $shareType);
 		}
 	}
 }

Indentation +49 added lines, -49 removed lines

@@ -17,58 +17,58 @@
  * This property contains multiple "share-type" elements, each containing a share type.
  */
 class ShareTypeList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * @param int[] $shareTypes
-	 */
-	public function __construct(
-		/**
-		 * Share types
-		 */
-		private $shareTypes,
-	) {
-	}
+    /**
+     * @param int[] $shareTypes
+     */
+    public function __construct(
+        /**
+         * Share types
+         */
+        private $shareTypes,
+    ) {
+    }
 
-	/**
-	 * Returns the share types
-	 *
-	 * @return int[]
-	 */
-	public function getShareTypes() {
-		return $this->shareTypes;
-	}
+    /**
+     * Returns the share types
+     *
+     * @return int[]
+     */
+    public function getShareTypes() {
+        return $this->shareTypes;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$shareTypes = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $shareTypes = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
-			}
-		}
-		return new self($shareTypes);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
+                $shareTypes[] = (int)$elem['value'];
+            }
+        }
+        return new self($shareTypes);
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->shareTypes as $shareType) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+        }
+    }
 }

apps/dav/lib/CalDAV/CalendarHome.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 			}
 		}
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
+		throw new NotFound('Node with name \''.$name.'\' could not be found');
 	}
 
 	/**

Indentation +173 added lines, -173 removed lines

@@ -29,177 +29,177 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var PluginManager */
-	private $pluginManager;
-	private ?array $cachedChildren = null;
-
-	public function __construct(
-		BackendInterface $caldavBackend,
-		array $principalInfo,
-		private LoggerInterface $logger,
-		private bool $returnCachedSubscriptions,
-	) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = Server::get(IConfig::class);
-		$this->pluginManager = new PluginManager(
-			\OC::$server,
-			Server::get(IAppManager::class)
-		);
-	}
-
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function createExtendedCollection($name, MkCol $mkCol): void {
-		$reservedNames = [
-			BirthdayService::BIRTHDAY_CALENDAR_URI,
-			TrashbinHome::NAME,
-		];
-
-		if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getChildren() {
-		if ($this->cachedChildren) {
-			return $this->cachedChildren;
-		}
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
-		}
-
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->config, $this->principalInfo['uri']);
-		}
-
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		if ($this->caldavBackend instanceof CalDavBackend) {
-			$objects[] = new TrashbinHome($this->caldavBackend, $this->principalInfo);
-		}
-
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($this->returnCachedSubscriptions) {
-					$objects[] = new CachedSubscription($this->caldavBackend, $subscription);
-				} else {
-					$objects[] = new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
-			/** @var ICalendarProvider $calendarPlugin */
-			$calendars = $calendarPlugin->fetchAllForCalendarHome($this->principalInfo['uri']);
-			foreach ($calendars as $calendar) {
-				$objects[] = $calendar;
-			}
-		}
-
-		$this->cachedChildren = $objects;
-		return $objects;
-	}
-
-	/**
-	 * @param string $name
-	 *
-	 * @return INode
-	 */
-	public function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->config, $this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === TrashbinHome::NAME && $this->caldavBackend instanceof CalDavBackend) {
-			return new TrashbinHome($this->caldavBackend, $this->principalInfo);
-		}
-
-		// Calendar - this covers all "regular" calendars, but not shared
-		// only check if the method is available
-		if ($this->caldavBackend instanceof CalDavBackend) {
-			$calendar = $this->caldavBackend->getCalendarByUri($this->principalInfo['uri'], $name);
-			if (!empty($calendar)) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
-			}
-		}
-
-		// Fallback to cover shared calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
-			}
-		}
-
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					if ($this->returnCachedSubscriptions) {
-						return new CachedSubscription($this->caldavBackend, $subscription);
-					}
-
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		if (ExternalCalendar::isAppGeneratedCalendar($name)) {
-			[$appId, $calendarUri] = ExternalCalendar::splitAppGeneratedCalendarUri($name);
-
-			foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
-				/** @var ICalendarProvider $calendarPlugin */
-				if ($calendarPlugin->getAppId() !== $appId) {
-					continue;
-				}
-
-				if ($calendarPlugin->hasCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)) {
-					return $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri);
-				}
-			}
-		}
-
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
-
-	/**
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 */
-	public function calendarSearch(array $filters, $limit = null, $offset = null) {
-		$principalUri = $this->principalInfo['uri'];
-		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
-	}
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var PluginManager */
+    private $pluginManager;
+    private ?array $cachedChildren = null;
+
+    public function __construct(
+        BackendInterface $caldavBackend,
+        array $principalInfo,
+        private LoggerInterface $logger,
+        private bool $returnCachedSubscriptions,
+    ) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = Server::get(IConfig::class);
+        $this->pluginManager = new PluginManager(
+            \OC::$server,
+            Server::get(IAppManager::class)
+        );
+    }
+
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createExtendedCollection($name, MkCol $mkCol): void {
+        $reservedNames = [
+            BirthdayService::BIRTHDAY_CALENDAR_URI,
+            TrashbinHome::NAME,
+        ];
+
+        if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getChildren() {
+        if ($this->cachedChildren) {
+            return $this->cachedChildren;
+        }
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
+        }
+
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->config, $this->principalInfo['uri']);
+        }
+
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        if ($this->caldavBackend instanceof CalDavBackend) {
+            $objects[] = new TrashbinHome($this->caldavBackend, $this->principalInfo);
+        }
+
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($this->returnCachedSubscriptions) {
+                    $objects[] = new CachedSubscription($this->caldavBackend, $subscription);
+                } else {
+                    $objects[] = new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
+            /** @var ICalendarProvider $calendarPlugin */
+            $calendars = $calendarPlugin->fetchAllForCalendarHome($this->principalInfo['uri']);
+            foreach ($calendars as $calendar) {
+                $objects[] = $calendar;
+            }
+        }
+
+        $this->cachedChildren = $objects;
+        return $objects;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return INode
+     */
+    public function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->config, $this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === TrashbinHome::NAME && $this->caldavBackend instanceof CalDavBackend) {
+            return new TrashbinHome($this->caldavBackend, $this->principalInfo);
+        }
+
+        // Calendar - this covers all "regular" calendars, but not shared
+        // only check if the method is available
+        if ($this->caldavBackend instanceof CalDavBackend) {
+            $calendar = $this->caldavBackend->getCalendarByUri($this->principalInfo['uri'], $name);
+            if (!empty($calendar)) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
+            }
+        }
+
+        // Fallback to cover shared calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
+            }
+        }
+
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    if ($this->returnCachedSubscriptions) {
+                        return new CachedSubscription($this->caldavBackend, $subscription);
+                    }
+
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        if (ExternalCalendar::isAppGeneratedCalendar($name)) {
+            [$appId, $calendarUri] = ExternalCalendar::splitAppGeneratedCalendarUri($name);
+
+            foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
+                /** @var ICalendarProvider $calendarPlugin */
+                if ($calendarPlugin->getAppId() !== $appId) {
+                    continue;
+                }
+
+                if ($calendarPlugin->hasCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)) {
+                    return $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri);
+                }
+            }
+        }
+
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
+
+    /**
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     */
+    public function calendarSearch(array $filters, $limit = null, $offset = null) {
+        $principalUri = $this->principalInfo['uri'];
+        return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarObject.php

Indentation +7 added lines, -7 removed lines

@@ -23,11 +23,11 @@
 
 class PublicCalendarObject extends CalendarObject {
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	protected function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    protected function isShared() {
+        return true;
+    }
 }