nextcloud / server

apps/dav/appinfo/app.php

Indentation +46 added lines, -46 removed lines

@@ -31,59 +31,59 @@ 
 $app->registerHooks();
 
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
-	return $app->getSyncService();
+    return $app->getSyncService();
 });
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-	function(GenericEvent $event) use ($app) {
-		/** @var CardDavBackend $cardDavBackend */
-		$cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
-		$addressBookUri = $event->getSubject();
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-		if (!is_null($addressBook)) {
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
-		}
-	}
+    function(GenericEvent $event) use ($app) {
+        /** @var CardDavBackend $cardDavBackend */
+        $cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
+        $addressBookUri = $event->getSubject();
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+        if (!is_null($addressBook)) {
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
+        }
+    }
 );
 
 $eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-	function(GenericEvent $event) use ($app) {
-		$jobList = $app->getContainer()->getServer()->getJobList();
-		$subscriptionData = $event->getArgument('subscriptionData');
+    function(GenericEvent $event) use ($app) {
+        $jobList = $app->getContainer()->getServer()->getJobList();
+        $subscriptionData = $event->getArgument('subscriptionData');
 
-		$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-			'principaluri' => $subscriptionData['principaluri'],
-			'uri' => $subscriptionData['uri']
-		]);
-	}
+        $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+            'principaluri' => $subscriptionData['principaluri'],
+            'uri' => $subscriptionData['uri']
+        ]);
+    }
 );
 
 $eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-	function(GenericEvent $event) use ($app) {
-		$jobList = $app->getContainer()->getServer()->getJobList();
-		$subscriptionData = $event->getArgument('subscriptionData');
+    function(GenericEvent $event) use ($app) {
+        $jobList = $app->getContainer()->getServer()->getJobList();
+        $subscriptionData = $event->getArgument('subscriptionData');
 
-		$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-			'principaluri' => $subscriptionData['principaluri'],
-			'uri' => $subscriptionData['uri']
-		]);
+        $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+            'principaluri' => $subscriptionData['principaluri'],
+            'uri' => $subscriptionData['uri']
+        ]);
 
-		/** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
-		$calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
-		$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-	}
+        /** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
+        $calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
+        $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+    }
 );
 
 $eventHandler = function() use ($app) {
-	try {
-		$job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);
-		$job->run([]);
-		$app->getContainer()->getServer()->getJobList()->setLastRun($job);
-	} catch(\Exception $ex) {
-		$app->getContainer()->getServer()->getLogger()->logException($ex);
-	}
+    try {
+        $job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);
+        $job->run([]);
+        $app->getContainer()->getServer()->getJobList()->setLastRun($job);
+    } catch(\Exception $ex) {
+        $app->getContainer()->getServer()->getLogger()->logException($ex);
+    }
 };
 
 $eventDispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
@@ -91,18 +91,18 @@ 
 
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
-	} else {
-		$app->setupSystemContactsProvider($cm);
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if (!is_null($user)) {
+        $app->setupContactsProvider($cm, $user->getUID());
+    } else {
+        $app->setupSystemContactsProvider($cm);
+    }
 });
 
 $calendarManager = \OC::$server->getCalendarManager();
 $calendarManager->register(function() use ($calendarManager, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if ($user !== null) {
-		$app->setupCalendarProvider($calendarManager, $user->getUID());
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if ($user !== null) {
+        $app->setupCalendarProvider($calendarManager, $user->getUID());
+    }
 });

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

Indentation +99 added lines, -99 removed lines

@@ -36,115 +36,115 @@
 
 class Plugin extends ServerPlugin {
 
-	/**
-	 * list of regular expressions for calendar user agents,
-	 * that do not support subscriptions on their own
-	 *
-	 * @var string[]
-	 */
-	const ENABLE_FOR_CLIENTS = [
-		// TODO - fill me
-	];
+    /**
+     * list of regular expressions for calendar user agents,
+     * that do not support subscriptions on their own
+     *
+     * @var string[]
+     */
+    const ENABLE_FOR_CLIENTS = [
+        // TODO - fill me
+    ];
 
-	/**
-	 * @var bool
-	 */
-	private $enabled=false;
+    /**
+     * @var bool
+     */
+    private $enabled=false;
 
-	/**
-	 * @var Server
-	 */
-	private $server;
+    /**
+     * @var Server
+     */
+    private $server;
 
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param IRequest $request
-	 */
-	public function __construct(IRequest $request) {
-		if ($request->isUserAgent(self::ENABLE_FOR_CLIENTS)) {
-			$this->enabled = true;
-		}
+    /**
+     * Plugin constructor.
+     *
+     * @param IRequest $request
+     */
+    public function __construct(IRequest $request) {
+        if ($request->isUserAgent(self::ENABLE_FOR_CLIENTS)) {
+            $this->enabled = true;
+        }
 
-		$magicHeader = $request->getHeader('X-NC-CALDAV-WEBCAL-CACHING');
-		if ($magicHeader === 'ON') {
-			$this->enabled = true;
-		}
-	}
+        $magicHeader = $request->getHeader('X-NC-CALDAV-WEBCAL-CACHING');
+        if ($magicHeader === 'ON') {
+            $this->enabled = true;
+        }
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$server->on('beforeMethod', [$this, 'beforeMethod']);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $server->on('beforeMethod', [$this, 'beforeMethod']);
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		if (!$this->enabled) {
-			return;
-		}
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+        if (!$this->enabled) {
+            return;
+        }
 
-		$path = $request->getPath();
-		$pathParts = explode('/', ltrim($path, '/'));
-		if (\count($pathParts) < 2) {
-			return;
-		}
+        $path = $request->getPath();
+        $pathParts = explode('/', ltrim($path, '/'));
+        if (\count($pathParts) < 2) {
+            return;
+        }
 
-		// $calendarHomePath will look like: calendars/username
-		$calendarHomePath = $pathParts[0] . '/' . $pathParts[1];
-		try {
-			$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-			if (!($calendarHome instanceof CalendarHome)) {
-				//how did we end up here?
-				return;
-			}
+        // $calendarHomePath will look like: calendars/username
+        $calendarHomePath = $pathParts[0] . '/' . $pathParts[1];
+        try {
+            $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+            if (!($calendarHome instanceof CalendarHome)) {
+                //how did we end up here?
+                return;
+            }
 
-			$calendarHome->enableCachedSubscriptionsForThisRequest();
-		} catch(NotFound $ex) {
-			return;
-		}
-	}
+            $calendarHome->enableCachedSubscriptionsForThisRequest();
+        } catch(NotFound $ex) {
+            return;
+        }
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function isCachingEnabledForThisRequest():bool {
-		return $this->enabled;
-	}
+    /**
+     * @return bool
+     */
+    public function isCachingEnabledForThisRequest():bool {
+        return $this->enabled;
+    }
 
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures():array {
-		return ['nc-calendar-webcal-cache'];
-	}
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures():array {
+        return ['nc-calendar-webcal-cache'];
+    }
 
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName():string {
-		return 'nc-calendar-webcal-cache';
-	}
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName():string {
+        return 'nc-calendar-webcal-cache';
+    }
 }

apps/dav/lib/CalDAV/CachedSubscription.php

Indentation +136 added lines, -136 removed lines

@@ -36,140 +36,140 @@
  */
 class CachedSubscription extends \Sabre\CalDAV\Calendar {
 
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI():string {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getACL():array {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			]
-		];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildACL():array {
-		return $this->getACL();
-	}
-
-	/**
-	 * @return null|string
-	 */
-	public function getOwner() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
-
-	/**
-	 *
-	 */
-	public function delete() {
-		$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
-	}
-
-	/**
-	 * @param PropPatch $propPatch
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		$this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
-	}
-
-	/**
-	 * @param string $name
-	 * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		$obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-		return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildren():array {
-		$objs = $this->caldavBackend->getCachedCalendarObjects($this->calendarInfo['id']);
-
-		$children = [];
-		foreach($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param array $paths
-	 * @return array
-	 */
-	public function getMultipleChildren(array $paths):array {
-		$objs = $this->caldavBackend->getMultipleCachedCalendarObjects($this->calendarInfo['id'], $paths);
-
-		$children = [];
-		foreach($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param string $name
-	 * @param null $calendarData
-	 * @return null|string|void
-	 * @throws MethodNotAllowed
-	 */
-	public function createFile($name, $calendarData = null) {
-		throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
-	}
-
-	/**
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name):bool {
-		$obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param array $filters
-	 * @return array
-	 */
-	public function calendarQuery(array $filters):array {
-		return $this->caldavBackend->cachedCalendarQuery($this->calendarInfo['id'], $filters);
-	}
-
-	/**
-	 * CachedSubscriptions don't support sync-tokens for now
-	 * Clients will have to do a multi get etag for now
-	 *
-	 * @return null
-	 */
-	public function getSyncToken() {
-		return null;
-	}
+    /**
+     * @return string
+     */
+    public function getPrincipalURI():string {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    /**
+     * @return array
+     */
+    public function getACL():array {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildACL():array {
+        return $this->getACL();
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getOwner() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
+
+    /**
+     *
+     */
+    public function delete() {
+        $this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
+    }
+
+    /**
+     * @param PropPatch $propPatch
+     */
+    public function propPatch(PropPatch $propPatch) {
+        $this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
+    }
+
+    /**
+     * @param string $name
+     * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        $obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+        return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildren():array {
+        $objs = $this->caldavBackend->getCachedCalendarObjects($this->calendarInfo['id']);
+
+        $children = [];
+        foreach($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param array $paths
+     * @return array
+     */
+    public function getMultipleChildren(array $paths):array {
+        $objs = $this->caldavBackend->getMultipleCachedCalendarObjects($this->calendarInfo['id'], $paths);
+
+        $children = [];
+        foreach($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param string $name
+     * @param null $calendarData
+     * @return null|string|void
+     * @throws MethodNotAllowed
+     */
+    public function createFile($name, $calendarData = null) {
+        throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name):bool {
+        $obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $filters
+     * @return array
+     */
+    public function calendarQuery(array $filters):array {
+        return $this->caldavBackend->cachedCalendarQuery($this->calendarInfo['id'], $filters);
+    }
+
+    /**
+     * CachedSubscriptions don't support sync-tokens for now
+     * Clients will have to do a multi get etag for now
+     *
+     * @return null
+     */
+    public function getSyncToken() {
+        return null;
+    }
 }

apps/dav/lib/CalDAV/CalendarHome.php

Indentation +123 added lines, -123 removed lines

@@ -37,127 +37,127 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	/** @var \OCP\IConfig */
-	private $config;
-
-	/** @var bool */
-	private $returnCachedSubscriptions=false;
-
-	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = \OC::$server->getConfig();
-	}
-
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function createExtendedCollection($name, MkCol $mkCol) {
-		$reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
-
-		if (in_array($name, $reservedNames)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-		}
-
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($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 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);
-				}
-			}
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	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->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		// Calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-			}
-		}
-
-		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);
-				}
-			}
-
-		}
-
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
-
-	/**
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 */
-	function calendarSearch(array $filters, $limit=null, $offset=null) {
-		$principalUri = $this->principalInfo['uri'];
-		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
-	}
-
-	/**
-	 *
-	 */
-	public function enableCachedSubscriptionsForThisRequest() {
-		$this->returnCachedSubscriptions = true;
-	}
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    /** @var \OCP\IConfig */
+    private $config;
+
+    /** @var bool */
+    private $returnCachedSubscriptions=false;
+
+    public function __construct(BackendInterface $caldavBackend, $principalInfo) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = \OC::$server->getConfig();
+    }
+
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function createExtendedCollection($name, MkCol $mkCol) {
+        $reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
+
+        if (in_array($name, $reservedNames)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+        }
+
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($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 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);
+                }
+            }
+        }
+
+        return $objects;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    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->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        // Calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+            }
+        }
+
+        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);
+                }
+            }
+
+        }
+
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
+
+    /**
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     */
+    function calendarSearch(array $filters, $limit=null, $offset=null) {
+        $principalUri = $this->principalInfo['uri'];
+        return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
+    }
+
+    /**
+     *
+     */
+    public function enableCachedSubscriptionsForThisRequest() {
+        $this->returnCachedSubscriptions = true;
+    }
 }

apps/dav/lib/CalDAV/CachedSubscriptionObject.php

Indentation +25 added lines, -25 removed lines

@@ -33,32 +33,32 @@
  */
 class CachedSubscriptionObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		// Pre-populating the 'calendardata' is optional, if we don't have it
-		// already we fetch it from the backend.
-		if (!isset($this->objectData['calendardata'])) {
-			$this->objectData = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
-		}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
+        }
 
-		return $this->objectData['calendardata'];
-	}
+        return $this->objectData['calendardata'];
+    }
 
-	/**
-	 * @param resource|string $calendarData
-	 * @return string|void
-	 * @throws MethodNotAllowed
-	 */
-	public function put($calendarData) {
-		throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
-	}
+    /**
+     * @param resource|string $calendarData
+     * @return string|void
+     * @throws MethodNotAllowed
+     */
+    public function put($calendarData) {
+        throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
+    }
 
-	/**
-	 * @throws MethodNotAllowed
-	 */
-	public function delete() {
-		throw new MethodNotAllowed('Deleting objects in cached subscription is not allowed');
-	}
+    /**
+     * @throws MethodNotAllowed
+     */
+    public function delete() {
+        throw new MethodNotAllowed('Deleting objects in cached subscription is not allowed');
+    }
 }

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

Indentation +126 added lines, -126 removed lines

@@ -34,133 +34,133 @@
 
 class RefreshWebcalJob extends TimedJob {
 
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var IClientService */
-	private $clientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * RefreshWebcalJob constructor.
-	 *
-	 * @param CalDavBackend $calDavBackend
-	 * @param IClientService $clientService
-	 * @param ILogger $logger
-	 */
-	public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger) {
-		$this->calDavBackend = $calDavBackend;
-		$this->clientService = $clientService;
-		$this->logger = $logger;
-
-		$this->setInterval(60*60*24);
-	}
-
-	/**
-	 * @param array $argument
-	 */
-	protected function run($argument) {
-		$principalUri = $argument['principaluri'];
-		$uri = $argument['uri'];
-
-		$subscriptions = array_filter(
-			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function($sub) use ($uri) {
-				return $sub['uri'] === $uri;
-			}
-		);
-
-		if (\count($subscriptions) === 0) {
-			return;
-		}
-		/** @var array $subscription */
-		$subscription = $subscriptions[0];
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var IClientService */
+    private $clientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * RefreshWebcalJob constructor.
+     *
+     * @param CalDavBackend $calDavBackend
+     * @param IClientService $clientService
+     * @param ILogger $logger
+     */
+    public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger) {
+        $this->calDavBackend = $calDavBackend;
+        $this->clientService = $clientService;
+        $this->logger = $logger;
+
+        $this->setInterval(60*60*24);
+    }
+
+    /**
+     * @param array $argument
+     */
+    protected function run($argument) {
+        $principalUri = $argument['principaluri'];
+        $uri = $argument['uri'];
+
+        $subscriptions = array_filter(
+            $this->calDavBackend->getSubscriptionsForUser($principalUri),
+            function($sub) use ($uri) {
+                return $sub['uri'] === $uri;
+            }
+        );
+
+        if (\count($subscriptions) === 0) {
+            return;
+        }
+        /** @var array $subscription */
+        $subscription = $subscriptions[0];
 
 //		if ($subscription['refreshrate'])
 
-		$webcalData = $this->queryWebcalFeed($subscription);
-		if (!$webcalData) {
-			return;
-		}
-
-		$stripTodos = $subscription['striptodos'];
-		$stripAlarms = $subscription['stripalarms'];
-		$stripAttachments = $subscription['stripattachments'];
-
-		try {
-			$splitter = new ICalendar($webcalData);
-
-			// we wait with deleting all purged events till we parsed the new ones
-			// in case the new calendar is broken and new ICalendar throws a ParseException
-			// the user will still see the old data
-			$this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
-
-			while ($vObject = $splitter->getNext()) {
-				/** @var Component $vObject */
-				$uid = null;
-				$compName = null;
-
-				foreach ($vObject->getComponents() as $component) {
-					if ($component->name === 'VTIMEZONE') {
-						continue;
-					}
-
-					$uid = $component->{'UID'}->getValue();
-					$compName = $component->name;
-
-					if ($stripAlarms) {
-						unset($component->{'VALARM'});
-					}
-					if ($stripAttachments) {
-						unset($component->{'ATTACH'});
-					}
-				}
-
-				if ($stripTodos && $compName === 'VTODO') {
-					continue;
-				}
-
-				$uri = $uid . '.ics';
-				$calendarData = $vObject->serialize();
-				try {
-					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
-					$this->logger->logException($ex);
-				}
-			}
-
-		} catch(ParseException $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
-		}
-	}
-
-	/**
-	 * @param array $subscription
-	 * @return null|resource
-	 */
-	private function queryWebcalFeed(array $subscription) {
-		$client = $this->clientService->newClient();
-		try {
-			$response = $client->get($subscription['source'], [
-				'stream' => true,
-				'allow_redirects' => [
-					'redirects' => 10
-				]
-			]);
-
-			return $response->getBody();
-		} catch(\Exception $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
-
-			return null;
-		}
-	}
+        $webcalData = $this->queryWebcalFeed($subscription);
+        if (!$webcalData) {
+            return;
+        }
+
+        $stripTodos = $subscription['striptodos'];
+        $stripAlarms = $subscription['stripalarms'];
+        $stripAttachments = $subscription['stripattachments'];
+
+        try {
+            $splitter = new ICalendar($webcalData);
+
+            // we wait with deleting all purged events till we parsed the new ones
+            // in case the new calendar is broken and new ICalendar throws a ParseException
+            // the user will still see the old data
+            $this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
+
+            while ($vObject = $splitter->getNext()) {
+                /** @var Component $vObject */
+                $uid = null;
+                $compName = null;
+
+                foreach ($vObject->getComponents() as $component) {
+                    if ($component->name === 'VTIMEZONE') {
+                        continue;
+                    }
+
+                    $uid = $component->{'UID'}->getValue();
+                    $compName = $component->name;
+
+                    if ($stripAlarms) {
+                        unset($component->{'VALARM'});
+                    }
+                    if ($stripAttachments) {
+                        unset($component->{'ATTACH'});
+                    }
+                }
+
+                if ($stripTodos && $compName === 'VTODO') {
+                    continue;
+                }
+
+                $uri = $uid . '.ics';
+                $calendarData = $vObject->serialize();
+                try {
+                    $this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
+                } catch(BadRequest $ex) {
+                    $this->logger->logException($ex);
+                }
+            }
+
+        } catch(ParseException $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
+        }
+    }
+
+    /**
+     * @param array $subscription
+     * @return null|resource
+     */
+    private function queryWebcalFeed(array $subscription) {
+        $client = $this->clientService->newClient();
+        try {
+            $response = $client->get($subscription['source'], [
+                'stream' => true,
+                'allow_redirects' => [
+                    'redirects' => 10
+                ]
+            ]);
+
+            return $response->getBody();
+        } catch(\Exception $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
+
+            return null;
+        }
+    }
 }

apps/dav/lib/Server.php

Indentation +213 added lines, -213 removed lines

@@ -66,244 +66,244 @@
 
 class Server {
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var  string */
-	private $baseUri;
+    /** @var  string */
+    private $baseUri;
 
-	/** @var Connector\Sabre\Server  */
-	public $server;
+    /** @var Connector\Sabre\Server  */
+    public $server;
 
-	public function __construct(IRequest $request, $baseUri) {
-		$this->request = $request;
-		$this->baseUri = $baseUri;
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    public function __construct(IRequest $request, $baseUri) {
+        $this->request = $request;
+        $this->baseUri = $baseUri;
+        $logger = \OC::$server->getLogger();
+        $dispatcher = \OC::$server->getEventDispatcher();
 
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
 
-		// Add maintenance plugin
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
+        // Add maintenance plugin
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
 
-		// Backends
-		$authBackend = new Auth(
-			\OC::$server->getSession(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getRequest(),
-			\OC::$server->getTwoFactorAuthManager(),
-			\OC::$server->getBruteForceThrottler()
-		);
+        // Backends
+        $authBackend = new Auth(
+            \OC::$server->getSession(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getRequest(),
+            \OC::$server->getTwoFactorAuthManager(),
+            \OC::$server->getBruteForceThrottler()
+        );
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
 
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
 
-		$bearerAuthBackend = new BearerAuth(
-			\OC::$server->getUserSession(),
-			\OC::$server->getSession(),
-			\OC::$server->getRequest()
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
+        $bearerAuthBackend = new BearerAuth(
+            \OC::$server->getUserSession(),
+            \OC::$server->getSession(),
+            \OC::$server->getRequest()
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
 
-		// debugging
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
+        // debugging
+        if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
 
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users', 'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-			if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-				$this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
-			}
-			$webcalCachingPlugin = new CalDAV\WebcalCaching\Plugin($request);
-			$this->server->addPlugin($webcalCachingPlugin);
-			if (!$webcalCachingPlugin->isCachingEnabledForThisRequest()) {
-				$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			}
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-				\OC::$server->getConfig(),
-				\OC::$server->getURLGenerator()
-			));
-		}
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
+            if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                $this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+            }
+            $webcalCachingPlugin = new CalDAV\WebcalCaching\Plugin($request);
+            $this->server->addPlugin($webcalCachingPlugin);
+            if (!$webcalCachingPlugin->isCachingEnabledForThisRequest()) {
+                $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            }
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+                \OC::$server->getConfig(),
+                \OC::$server->getURLGenerator()
+            ));
+        }
 
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
-		}
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
+        }
 
-		// system tags plugins
-		$this->server->addPlugin(new SystemTagPlugin(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getUserSession()
-		));
+        // system tags plugins
+        $this->server->addPlugin(new SystemTagPlugin(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getGroupManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OC::$server->getCommentsManager(),
-			\OC::$server->getUserSession()
-		));
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OC::$server->getCommentsManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new ChunkingPlugin());
 
-		// allow setup of additional plugins
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        // allow setup of additional plugins
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
 
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if($request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if($request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod', function () use ($root, $lazySearchBackend) {
-			// custom properties plugin must be the last one
-			$userSession = \OC::$server->getUserSession();
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = \OC\Files\Filesystem::getView();
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						\OC::$server->getConfig(),
-						$this->request,
-						\OC::$server->getPreviewManager(),
-						false,
-						!\OC::$server->getConfig()->getSystemValue('debug', false)
-					)
-				);
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod', function () use ($root, $lazySearchBackend) {
+            // custom properties plugin must be the last one
+            $userSession = \OC::$server->getUserSession();
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = \OC\Files\Filesystem::getView();
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        \OC::$server->getConfig(),
+                        $this->request,
+                        \OC::$server->getPreviewManager(),
+                        false,
+                        !\OC::$server->getConfig()->getSystemValue('debug', false)
+                    )
+                );
 
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server->tree,
-							\OC::$server->getDatabaseConnection(),
-							\OC::$server->getUserSession()->getUser()
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view, false));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OC::$server->getTagManager()
-					)
-				);
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OC::$server->getCommentsManager(),
-					$userSession
-				));
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OC::$server->getSystemTagManager(),
-						\OC::$server->getSystemTagObjectMapper(),
-						\OC::$server->getTagManager(),
-						$userSession,
-						\OC::$server->getGroupManager(),
-						$userFolder
-					));
-					$lazySearchBackend->setBackend(new \OCA\DAV\Files\FileSearchBackend(
-						$this->server->tree,
-						$user,
-						\OC::$server->getRootFolder(),
-						\OC::$server->getShareManager(),
-						$view
-					));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
-					\OC::$server->getConfig(),
-					\OC::$server->query(BirthdayService::class)
-				));
-			}
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server->tree,
+                            \OC::$server->getDatabaseConnection(),
+                            \OC::$server->getUserSession()->getUser()
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view, false));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OC::$server->getTagManager()
+                    )
+                );
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OC::$server->getCommentsManager(),
+                    $userSession
+                ));
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OC::$server->getSystemTagManager(),
+                        \OC::$server->getSystemTagObjectMapper(),
+                        \OC::$server->getTagManager(),
+                        $userSession,
+                        \OC::$server->getGroupManager(),
+                        $userFolder
+                    ));
+                    $lazySearchBackend->setBackend(new \OCA\DAV\Files\FileSearchBackend(
+                        $this->server->tree,
+                        $user,
+                        \OC::$server->getRootFolder(),
+                        \OC::$server->getShareManager(),
+                        $view
+                    ));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
+                    \OC::$server->getConfig(),
+                    \OC::$server->query(BirthdayService::class)
+                ));
+            }
 
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OC::$server->getAppManager()
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-	}
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OC::$server->getAppManager()
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+    }
 
-	public function exec() {
-		$this->server->exec();
-	}
+    public function exec() {
+        $this->server->exec();
+    }
 
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (strpos($this->server->getRequestUri(), $subTree.'/') === 0) {
-				return true;
-			}
-		}
-		return false;
-	}
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (strpos($this->server->getRequestUri(), $subTree.'/') === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

apps/dav/lib/Migration/RefreshWebcalJobRegistrar.php

Indentation +41 added lines, -41 removed lines

@@ -32,52 +32,52 @@
 
 class RefreshWebcalJobRegistrar implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/**
-	 * FixBirthdayCalendarComponent constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IJobList $jobList
-	 */
-	public function __construct(IDBConnection $connection, IJobList $jobList) {
-		$this->connection = $connection;
-		$this->jobList = $jobList;
-	}
+    /**
+     * FixBirthdayCalendarComponent constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IJobList $jobList
+     */
+    public function __construct(IDBConnection $connection, IJobList $jobList) {
+        $this->connection = $connection;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Registering background jobs to update cache for webcal calendars';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Registering background jobs to update cache for webcal calendars';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['principaluri', 'uri'])
-			->from('calendarsubscriptions');
-		$stmt = $query->execute();
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['principaluri', 'uri'])
+            ->from('calendarsubscriptions');
+        $stmt = $query->execute();
 
-		$count = 0;
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$args = [
-				'principaluri' => $row['principaluri'],
-				'uri' => $row['uri'],
-			];
+        $count = 0;
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $args = [
+                'principaluri' => $row['principaluri'],
+                'uri' => $row['uri'],
+            ];
 
-			if (!$this->jobList->has(RefreshWebcalJob::class, $args)) {
-				$this->jobList->add(RefreshWebcalJob::class, $args);
-				$count++;
-			}
-		}
+            if (!$this->jobList->has(RefreshWebcalJob::class, $args)) {
+                $this->jobList->add(RefreshWebcalJob::class, $args);
+                $count++;
+            }
+        }
 
-		$output->info("Added $count background jobs to update webcal calendars");
-	}
+        $output->info("Added $count background jobs to update webcal calendars");
+    }
 }

apps/dav/lib/Migration/Version1006Date20180628111625.php

Indentation +70 added lines, -70 removed lines

@@ -31,78 +31,78 @@
 
 class Version1006Date20180628111625 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();
 
-		if (!$schema->hasTable('calendarsubscrobjects')) {
-			$table = $schema->createTable('calendarsubscrobjects');
-			$table->addColumn('id', Type::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendardata', Type::BLOB, [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('subscriptionid', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastmodified', Type::INTEGER, [
-				'notnull' => false,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', Type::STRING, [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('componenttype', Type::STRING, [
-				'notnull' => false,
-				'length' => 8,
-			]);
-			$table->addColumn('firstoccurence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastoccurence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('classification', Type::INTEGER, [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['subscriptionid', 'uri'], 'subobjects_index');
-		}
+        if (!$schema->hasTable('calendarsubscrobjects')) {
+            $table = $schema->createTable('calendarsubscrobjects');
+            $table->addColumn('id', Type::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendardata', Type::BLOB, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('subscriptionid', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastmodified', Type::INTEGER, [
+                'notnull' => false,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', Type::STRING, [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('componenttype', Type::STRING, [
+                'notnull' => false,
+                'length' => 8,
+            ]);
+            $table->addColumn('firstoccurence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastoccurence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('classification', Type::INTEGER, [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['subscriptionid', 'uri'], 'subobjects_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }