nextcloud / server

remote.php

Indentation +107 added lines, -107 removed lines

@@ -48,43 +48,43 @@ 
  * @param Exception|Error $e
  */
 function handleException($e) {
-	$request = \OC::$server->getRequest();
-	// in case the request content type is text/xml - we assume it's a WebDAV request
-	$isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
-	if ($isXmlContentType === 0) {
-		// fire up a simple server to properly process the exception
-		$server = new Server();
-		if (!($e instanceof RemoteException)) {
-			// we shall not log on RemoteException
-			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
-		}
-		$server->on('beforeMethod:*', function () use ($e) {
-			if ($e instanceof RemoteException) {
-				switch ($e->getCode()) {
-					case 503:
-						throw new ServiceUnavailable($e->getMessage());
-					case 404:
-						throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
-				}
-			}
-			$class = get_class($e);
-			$msg = $e->getMessage();
-			throw new ServiceUnavailable("$class: $msg");
-		});
-		$server->exec();
-	} else {
-		$statusCode = 500;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
-			$statusCode = 503;
-		}
-		if ($e instanceof RemoteException) {
-			// we shall not log on RemoteException
-			OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
-		} else {
-			\OC::$server->getLogger()->logException($e, ['app' => 'remote']);
-			OC_Template::printExceptionErrorPage($e, $statusCode);
-		}
-	}
+    $request = \OC::$server->getRequest();
+    // in case the request content type is text/xml - we assume it's a WebDAV request
+    $isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
+    if ($isXmlContentType === 0) {
+        // fire up a simple server to properly process the exception
+        $server = new Server();
+        if (!($e instanceof RemoteException)) {
+            // we shall not log on RemoteException
+            $server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
+        }
+        $server->on('beforeMethod:*', function () use ($e) {
+            if ($e instanceof RemoteException) {
+                switch ($e->getCode()) {
+                    case 503:
+                        throw new ServiceUnavailable($e->getMessage());
+                    case 404:
+                        throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
+                }
+            }
+            $class = get_class($e);
+            $msg = $e->getMessage();
+            throw new ServiceUnavailable("$class: $msg");
+        });
+        $server->exec();
+    } else {
+        $statusCode = 500;
+        if ($e instanceof \OC\ServiceUnavailableException ) {
+            $statusCode = 503;
+        }
+        if ($e instanceof RemoteException) {
+            // we shall not log on RemoteException
+            OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
+        } else {
+            \OC::$server->getLogger()->logException($e, ['app' => 'remote']);
+            OC_Template::printExceptionErrorPage($e, $statusCode);
+        }
+    }
 }
 
 /**
@@ -92,80 +92,80 @@ 
  * @return string
  */
 function resolveService($service) {
-	$services = [
-		'webdav' => 'dav/appinfo/v1/webdav.php',
-		'dav' => 'dav/appinfo/v2/remote.php',
-		'caldav' => 'dav/appinfo/v1/caldav.php',
-		'calendar' => 'dav/appinfo/v1/caldav.php',
-		'carddav' => 'dav/appinfo/v1/carddav.php',
-		'contacts' => 'dav/appinfo/v1/carddav.php',
-		'files' => 'dav/appinfo/v1/webdav.php',
-		'direct' => 'dav/appinfo/v2/direct.php',
-	];
-	if (isset($services[$service])) {
-		return $services[$service];
-	}
-
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+    $services = [
+        'webdav' => 'dav/appinfo/v1/webdav.php',
+        'dav' => 'dav/appinfo/v2/remote.php',
+        'caldav' => 'dav/appinfo/v1/caldav.php',
+        'calendar' => 'dav/appinfo/v1/caldav.php',
+        'carddav' => 'dav/appinfo/v1/carddav.php',
+        'contacts' => 'dav/appinfo/v1/carddav.php',
+        'files' => 'dav/appinfo/v1/webdav.php',
+        'direct' => 'dav/appinfo/v2/direct.php',
+    ];
+    if (isset($services[$service])) {
+        return $services[$service];
+    }
+
+    return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
-
-	// All resources served via the DAV endpoint should have the strictest possible
-	// policy. Exempted from this is the SabreDAV browser plugin which overwrites
-	// this policy with a softer one if debug mode is enabled.
-	header("Content-Security-Policy: default-src 'none';");
-
-	if (\OCP\Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		throw new RemoteException('Service unavailable', 503);
-	}
-
-	$request = \OC::$server->getRequest();
-	$pathInfo = $request->getPathInfo();
-	if ($pathInfo === false || $pathInfo === '') {
-		throw new RemoteException('Path not found', 404);
-	}
-	if (!$pos = strpos($pathInfo, '/', 1)) {
-		$pos = strlen($pathInfo);
-	}
-	$service=substr($pathInfo, 1, $pos-1);
-
-	$file = resolveService($service);
-
-	if(is_null($file)) {
-		throw new RemoteException('Path not found', 404);
-	}
-
-	$file=ltrim($file, '/');
-
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
-
-	// Load all required applications
-	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(['authentication']);
-	OC_App::loadApps(['filesystem', 'logging']);
-
-	switch ($app) {
-		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
-			break;
-		default:
-			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
-			}
-			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
-			break;
-	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once $file;
+    require_once __DIR__ . '/lib/base.php';
+
+    // All resources served via the DAV endpoint should have the strictest possible
+    // policy. Exempted from this is the SabreDAV browser plugin which overwrites
+    // this policy with a softer one if debug mode is enabled.
+    header("Content-Security-Policy: default-src 'none';");
+
+    if (\OCP\Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        throw new RemoteException('Service unavailable', 503);
+    }
+
+    $request = \OC::$server->getRequest();
+    $pathInfo = $request->getPathInfo();
+    if ($pathInfo === false || $pathInfo === '') {
+        throw new RemoteException('Path not found', 404);
+    }
+    if (!$pos = strpos($pathInfo, '/', 1)) {
+        $pos = strlen($pathInfo);
+    }
+    $service=substr($pathInfo, 1, $pos-1);
+
+    $file = resolveService($service);
+
+    if(is_null($file)) {
+        throw new RemoteException('Path not found', 404);
+    }
+
+    $file=ltrim($file, '/');
+
+    $parts=explode('/', $file, 2);
+    $app=$parts[0];
+
+    // Load all required applications
+    \OC::$REQUESTEDAPP = $app;
+    OC_App::loadApps(['authentication']);
+    OC_App::loadApps(['filesystem', 'logging']);
+
+    switch ($app) {
+        case 'core':
+            $file =  OC::$SERVERROOT .'/'. $file;
+            break;
+        default:
+            if (!\OC::$server->getAppManager()->isInstalled($app)) {
+                throw new RemoteException('App not installed: ' . $app);
+            }
+            OC_App::loadApp($app);
+            $file = OC_App::getAppPath($app) .'/'. $parts[1];
+            break;
+    }
+    $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+    require_once $file;
 
 } catch (Exception $ex) {
-	handleException($ex);
+    handleException($ex);
 } catch (Error $e) {
-	handleException($e);
+    handleException($e);
 }

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use Sabre\DAV\Exception\ServiceUnavailable;
@@ -58,7 +58,7 @@ 
 			// we shall not log on RemoteException
 			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
 		}
-		$server->on('beforeMethod:*', function () use ($e) {
+		$server->on('beforeMethod:*', function() use ($e) {
 			if ($e instanceof RemoteException) {
 				switch ($e->getCode()) {
 					case 503:
@@ -74,7 +74,7 @@ 
 		$server->exec();
 	} else {
 		$statusCode = 500;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
+		if ($e instanceof \OC\ServiceUnavailableException) {
 			$statusCode = 503;
 		}
 		if ($e instanceof RemoteException) {
@@ -106,11 +106,11 @@ 
 		return $services[$service];
 	}
 
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+	return \OC::$server->getConfig()->getAppValue('core', 'remote_'.$service);
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// All resources served via the DAV endpoint should have the strictest possible
 	// policy. Exempted from this is the SabreDAV browser plugin which overwrites
@@ -131,18 +131,18 @@ 
 	if (!$pos = strpos($pathInfo, '/', 1)) {
 		$pos = strlen($pathInfo);
 	}
-	$service=substr($pathInfo, 1, $pos-1);
+	$service = substr($pathInfo, 1, $pos - 1);
 
 	$file = resolveService($service);
 
-	if(is_null($file)) {
+	if (is_null($file)) {
 		throw new RemoteException('Path not found', 404);
 	}
 
-	$file=ltrim($file, '/');
+	$file = ltrim($file, '/');
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts = explode('/', $file, 2);
+	$app = $parts[0];
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
@@ -151,17 +151,17 @@ 
 
 	switch ($app) {
 		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
+			$file = OC::$SERVERROOT.'/'.$file;
 			break;
 		default:
 			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
+				throw new RemoteException('App not installed: '.$app);
 			}
 			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			$file = OC_App::getAppPath($app).'/'.$parts[1];
 			break;
 	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
 	require_once $file;
 
 } catch (Exception $ex) {

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Indentation +38 added lines, -38 removed lines

@@ -34,52 +34,52 @@
  */
 class FilesDropPlugin extends ServerPlugin {
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/** @var bool */
-	private $enabled = false;
+    /** @var bool */
+    private $enabled = false;
 
-	/**
-	 * @param View $view
-	 */
-	public function setView($view) {
-		$this->view = $view;
-	}
+    /**
+     * @param View $view
+     */
+    public function setView($view) {
+        $this->view = $view;
+    }
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 * @throws MethodNotAllowed
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
-		$this->enabled = false;
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     * @throws MethodNotAllowed
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
+        $this->enabled = false;
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response){
 
-		if (!$this->enabled) {
-			return;
-		}
+        if (!$this->enabled) {
+            return;
+        }
 
-		if ($request->getMethod() !== 'PUT') {
-			throw new MethodNotAllowed('Only PUT is allowed on files drop');
-		}
+        if ($request->getMethod() !== 'PUT') {
+            throw new MethodNotAllowed('Only PUT is allowed on files drop');
+        }
 
-		$path = explode('/', $request->getPath());
-		$path = array_pop($path);
+        $path = explode('/', $request->getPath());
+        $path = array_pop($path);
 
-		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
-		$request->setUrl($url);
-	}
+        $newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
+        $url = $request->getBaseUrl() . $newName;
+        $request->setUrl($url);
+    }
 }

apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php

Indentation +26 added lines, -26 removed lines

@@ -32,33 +32,33 @@
  * Verify that the public link share is valid
  */
 class PublicLinkCheckPlugin extends ServerPlugin {
-	/**
-	 * @var FileInfo
-	 */
-	private $fileInfo;
+    /**
+     * @var FileInfo
+     */
+    private $fileInfo;
 
-	/**
-	 * @param FileInfo $fileInfo
-	 */
-	public function setFileInfo($fileInfo) {
-		$this->fileInfo = $fileInfo;
-	}
+    /**
+     * @param FileInfo $fileInfo
+     */
+    public function setFileInfo($fileInfo) {
+        $this->fileInfo = $fileInfo;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod']);
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
-		// verify that the owner didn't have his share permissions revoked
-		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
-			throw new NotFound();
-		}
-	}
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+        // verify that the owner didn't have his share permissions revoked
+        if ($this->fileInfo && !$this->fileInfo->isShareable()) {
+            throw new NotFound();
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
 	}
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 		// verify that the owner didn't have his share permissions revoked
 		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
 			throw new NotFound();

apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php

Indentation +71 added lines, -71 removed lines

@@ -36,86 +36,86 @@
 
 class InvitationResponseServer {
 
-	/** @var \OCA\DAV\Connector\Sabre\Server */
-	public $server;
+    /** @var \OCA\DAV\Connector\Sabre\Server */
+    public $server;
 
-	/**
-	 * InvitationResponseServer constructor.
-	 */
-	public function __construct() {
-		$baseUri = \OC::$WEBROOT . '/remote.php/dav/';
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    /**
+     * InvitationResponseServer constructor.
+     */
+    public function __construct() {
+        $baseUri = \OC::$WEBROOT . '/remote.php/dav/';
+        $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()));
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($baseUri);
-		$this->server->setBaseUri($baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($baseUri);
+        $this->server->setBaseUri($baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$this->server->addPlugin(new class() extends Plugin {
-			public function getCurrentPrincipal() {
-				return 'principals/system/public';
-			}
-		});
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $this->server->addPlugin(new class() extends Plugin {
+            public function getCurrentPrincipal() {
+                return 'principals/system/public';
+            }
+        });
 
-		// 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);
 
-		$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'
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups'
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-		//$this->server->addPlugin(new \OCA\DAV\DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-			\OC::$server->getConfig(),
-			\OC::$server->getURLGenerator()
-		));
+        // calendar plugins
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+        //$this->server->addPlugin(new \OCA\DAV\DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+            \OC::$server->getConfig(),
+            \OC::$server->getURLGenerator()
+        ));
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root) {
-			// 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);
-			}
-		});
-	}
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root) {
+            // 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);
+            }
+        });
+    }
 
-	/**
-	 * @param Message $iTipMessage
-	 * @return void
-	 */
-	public function handleITipMessage(Message $iTipMessage) {
-		/** @var \OCA\DAV\CalDAV\Schedule\Plugin $schedulingPlugin */
-		$schedulingPlugin = $this->server->getPlugin('caldav-schedule');
-		$schedulingPlugin->scheduleLocalDelivery($iTipMessage);
-	}
+    /**
+     * @param Message $iTipMessage
+     * @return void
+     */
+    public function handleITipMessage(Message $iTipMessage) {
+        /** @var \OCA\DAV\CalDAV\Schedule\Plugin $schedulingPlugin */
+        $schedulingPlugin = $this->server->getPlugin('caldav-schedule');
+        $schedulingPlugin->scheduleLocalDelivery($iTipMessage);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	 * InvitationResponseServer constructor.
 	 */
 	public function __construct() {
-		$baseUri = \OC::$WEBROOT . '/remote.php/dav/';
+		$baseUri = \OC::$WEBROOT.'/remote.php/dav/';
 		$logger = \OC::$server->getLogger();
 		$dispatcher = \OC::$server->getEventDispatcher();
 
@@ -94,7 +94,7 @@ 
 		));
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root) {
+		$this->server->on('beforeMethod:*', function() use ($root) {
 			// register plugins from apps
 			$pluginManager = new PluginManager(
 				\OC::$server,

apps/dav/lib/CalDAV/BirthdayService.php

Indentation +431 added lines, -431 removed lines

@@ -50,435 +50,435 @@
  */
 class BirthdayService {
 
-	const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
-
-	/** @var GroupPrincipalBackend */
-	private $principalBackend;
-
-	/** @var CalDavBackend  */
-	private $calDavBackEnd;
-
-	/** @var CardDavBackend  */
-	private $cardDavBackEnd;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/**
-	 * BirthdayService constructor.
-	 *
-	 * @param CalDavBackend $calDavBackEnd
-	 * @param CardDavBackend $cardDavBackEnd
-	 * @param GroupPrincipalBackend $principalBackend
-	 * @param IConfig $config
-	 * @param IDBConnection $dbConnection
-	 * @param IL10N $l10n
-	 */
-	public function __construct(CalDavBackend $calDavBackEnd,
-								CardDavBackend $cardDavBackEnd,
-								GroupPrincipalBackend $principalBackend,
-								IConfig $config,
-								IDBConnection $dbConnection,
-								IL10N $l10n) {
-		$this->calDavBackEnd = $calDavBackEnd;
-		$this->cardDavBackEnd = $cardDavBackEnd;
-		$this->principalBackend = $principalBackend;
-		$this->config = $config;
-		$this->dbConnection = $dbConnection;
-		$this->l10n = $l10n;
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 */
-	public function onCardChanged(int $addressBookId,
-								  string $cardUri,
-								  string $cardData) {
-		if (!$this->isGloballyEnabled()) {
-			return;
-		}
-
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		$datesToSync = [
-			['postfix' => '', 'field' => 'BDAY'],
-			['postfix' => '-death', 'field' => 'DEATHDATE'],
-			['postfix' => '-anniversary', 'field' => 'ANNIVERSARY'],
-		];
-
-		foreach ($targetPrincipals as $principalUri) {
-			if (!$this->isUserEnabled($principalUri)) {
-				continue;
-			}
-
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach ($datesToSync as $type) {
-				$this->updateCalendar($cardUri, $cardData, $book, (int) $calendar['id'], $type);
-			}
-		}
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
-	public function onCardDeleted(int $addressBookId,
-								  string $cardUri) {
-		if (!$this->isGloballyEnabled()) {
-			return;
-		}
-
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		foreach ($targetPrincipals as $principalUri) {
-			if (!$this->isUserEnabled($principalUri)) {
-				continue;
-			}
-
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
-				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
-			}
-		}
-	}
-
-	/**
-	 * @param string $principal
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureCalendarExists(string $principal):?array {
-		$calendar = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-		if (!is_null($calendar)) {
-			return $calendar;
-		}
-		$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
-			'{DAV:}displayname' => 'Contact birthdays',
-			'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
-			'components'   => 'VEVENT',
-		]);
-
-		return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-	}
-
-	/**
-	 * @param $cardData
-	 * @param $dateField
-	 * @param $postfix
-	 * @return VCalendar|null
-	 * @throws InvalidDataException
-	 */
-	public function buildDateFromContact(string $cardData,
-										 string $dateField,
-										 string $postfix):?VCalendar {
-		if (empty($cardData)) {
-			return null;
-		}
-		try {
-			$doc = Reader::read($cardData);
-			// We're always converting to vCard 4.0 so we can rely on the
-			// VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
-			if (!$doc instanceof VCard) {
-				return null;
-			}
-			$doc = $doc->convert(Document::VCARD40);
-		} catch (Exception $e) {
-			return null;
-		}
-
-		if (!isset($doc->{$dateField})) {
-			return null;
-		}
-		if (!isset($doc->FN)) {
-			return null;
-		}
-		$birthday = $doc->{$dateField};
-		if (!(string)$birthday) {
-			return null;
-		}
-		// Skip if the BDAY property is not of the right type.
-		if (!$birthday instanceof DateAndOrTime) {
-			return null;
-		}
-
-		// Skip if we can't parse the BDAY value.
-		try {
-			$dateParts = DateTimeParser::parseVCardDateTime($birthday->getValue());
-		} catch (InvalidDataException $e) {
-			return null;
-		}
-
-		$unknownYear = false;
-		$originalYear = null;
-		if (!$dateParts['year']) {
-			$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
-
-			$unknownYear = true;
-		} else {
-			$parameters = $birthday->parameters();
-			if (isset($parameters['X-APPLE-OMIT-YEAR'])) {
-				$omitYear = $parameters['X-APPLE-OMIT-YEAR'];
-				if ($dateParts['year'] === $omitYear) {
-					$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
-					$unknownYear = true;
-				}
-			} else {
-				$originalYear = (int)$dateParts['year'];
-
-				if ($originalYear < 1970) {
-					$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
-				}
-			}
-		}
-
-		try {
-			if ($birthday instanceof DateAndOrTime) {
-				$date = $birthday->getDateTime();
-			} else {
-				$date = new \DateTimeImmutable($birthday);
-			}
-		} catch (Exception $e) {
-			return null;
-		}
-
-		$summary = $this->formatTitle($dateField, $doc->FN->getValue(), $originalYear, $this->dbConnection->supports4ByteText());
-
-		$vCal = new VCalendar();
-		$vCal->VERSION = '2.0';
-		$vCal->PRODID = '-//IDN nextcloud.com//Birthday calendar//EN';
-		$vEvent = $vCal->createComponent('VEVENT');
-		$vEvent->add('DTSTART');
-		$vEvent->DTSTART->setDateTime(
-			$date
-		);
-		$vEvent->DTSTART['VALUE'] = 'DATE';
-		$vEvent->add('DTEND');
-
-		$dtEndDate = (new \DateTime())->setTimestamp($date->getTimeStamp());
-		$dtEndDate->add(new \DateInterval('P1D'));
-		$vEvent->DTEND->setDateTime(
-			$dtEndDate
-		);
-
-		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID . $postfix;
-		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
-		$vEvent->{'SUMMARY'} = $summary;
-		$vEvent->{'TRANSP'} = 'TRANSPARENT';
-		$vEvent->{'X-NEXTCLOUD-BC-FIELD-TYPE'} = $dateField;
-		$vEvent->{'X-NEXTCLOUD-BC-UNKNOWN-YEAR'} = $unknownYear ? '1' : '0';
-		if ($originalYear !== null) {
-			$vEvent->{'X-NEXTCLOUD-BC-YEAR'} = (string) $originalYear;
-		}
-		$alarm = $vCal->createComponent('VALARM');
-		$alarm->add($vCal->createProperty('TRIGGER', '-PT0M', ['VALUE' => 'DURATION']));
-		$alarm->add($vCal->createProperty('ACTION', 'DISPLAY'));
-		$alarm->add($vCal->createProperty('DESCRIPTION', $vEvent->{'SUMMARY'}));
-		$vEvent->add($alarm);
-		$vCal->add($vEvent);
-		return $vCal;
-	}
-
-	/**
-	 * @param string $user
-	 */
-	public function resetForUser(string $user):void {
-		$principal = 'principals/users/'.$user;
-		$calendar = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-		$calendarObjects = $this->calDavBackEnd->getCalendarObjects($calendar['id'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
-
-		foreach($calendarObjects as $calendarObject) {
-			$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
-		}
-	}
-
-	/**
-	 * @param string $user
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function syncUser(string $user):void {
-		$principal = 'principals/users/'.$user;
-		$this->ensureCalendarExists($principal);
-		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
-		foreach($books as $book) {
-			$cards = $this->cardDavBackEnd->getCards($book['id']);
-			foreach($cards as $card) {
-				$this->onCardChanged((int) $book['id'], $card['uri'], $card['carddata']);
-			}
-		}
-	}
-
-	/**
-	 * @param string $existingCalendarData
-	 * @param VCalendar $newCalendarData
-	 * @return bool
-	 */
-	public function birthdayEvenChanged(string $existingCalendarData,
-										VCalendar $newCalendarData):bool {
-		try {
-			$existingBirthday = Reader::read($existingCalendarData);
-		} catch (Exception $ex) {
-			return true;
-		}
-
-		return (
-			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
-		);
-	}
-
-	/**
-	 * @param integer $addressBookId
-	 * @return mixed
-	 */
-	protected function getAllAffectedPrincipals(int $addressBookId) {
-		$targetPrincipals = [];
-		$shares = $this->cardDavBackEnd->getShares($addressBookId);
-		foreach ($shares as $share) {
-			if ($share['{http://owncloud.org/ns}group-share']) {
-				$users = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
-				foreach ($users as $user) {
-					$targetPrincipals[] = $user['uri'];
-				}
-			} else {
-				$targetPrincipals[] = $share['{http://owncloud.org/ns}principal'];
-			}
-		}
-		return array_values(array_unique($targetPrincipals, SORT_STRING));
-	}
-
-	/**
-	 * @param string $cardUri
-	 * @param string $cardData
-	 * @param array $book
-	 * @param int $calendarId
-	 * @param array $type
-	 * @throws InvalidDataException
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	private function updateCalendar(string $cardUri,
-									string $cardData,
-									array $book,
-									int $calendarId,
-									array $type):void {
-		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
-		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix']);
-		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
-		if (is_null($calendarData)) {
-			if (!is_null($existing)) {
-				$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
-			}
-		} else {
-			if (is_null($existing)) {
-				$this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
-			} else {
-				if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
-					$this->calDavBackEnd->updateCalendarObject($calendarId, $objectUri, $calendarData->serialize());
-				}
-			}
-		}
-	}
-
-	/**
-	 * checks if the admin opted-out of birthday calendars
-	 *
-	 * @return bool
-	 */
-	private function isGloballyEnabled():bool {
-		return $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes') === 'yes';
-	}
-
-	/**
-	 * Checks if the user opted-out of birthday calendars
-	 *
-	 * @param string $userPrincipal The user principal to check for
-	 * @return bool
-	 */
-	private function isUserEnabled(string $userPrincipal):bool {
-		if (strpos($userPrincipal, 'principals/users/') === 0) {
-			$userId = substr($userPrincipal, 17);
-			$isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-			return $isEnabled === 'yes';
-		}
-
-		// not sure how we got here, just be on the safe side and return true
-		return true;
-	}
-
-	/**
-	 * Formats title of Birthday event
-	 *
-	 * @param string $field Field name like BDAY, ANNIVERSARY, ...
-	 * @param string $name Name of contact
-	 * @param int|null $year Year of birth, anniversary, ...
-	 * @param bool $supports4Byte Whether or not the database supports 4 byte chars
-	 * @return string The formatted title
-	 */
-	private function formatTitle(string $field,
-								 string $name,
-								 int $year=null,
-								 bool $supports4Byte=true):string {
-		if ($supports4Byte) {
-			switch ($field) {
-				case 'BDAY':
-					return implode('', [
-						'

Spacing +22 added lines, -22 removed lines

@@ -147,7 +147,7 @@ 
 
 			$calendar = $this->ensureCalendarExists($principalUri);
 			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+				$objectUri = $book['uri'].'-'.$cardUri.$tag.'.ics';
 				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
 			}
 		}
@@ -158,7 +158,7 @@ 
 	 * @return array|null
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 */
-	public function ensureCalendarExists(string $principal):?array {
+	public function ensureCalendarExists(string $principal): ?array {
 		$calendar = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
 		if (!is_null($calendar)) {
 			return $calendar;
@@ -181,7 +181,7 @@ 
 	 */
 	public function buildDateFromContact(string $cardData,
 										 string $dateField,
-										 string $postfix):?VCalendar {
+										 string $postfix): ?VCalendar {
 		if (empty($cardData)) {
 			return null;
 		}
@@ -204,7 +204,7 @@ 
 			return null;
 		}
 		$birthday = $doc->{$dateField};
-		if (!(string)$birthday) {
+		if (!(string) $birthday) {
 			return null;
 		}
 		// Skip if the BDAY property is not of the right type.
@@ -222,7 +222,7 @@ 
 		$unknownYear = false;
 		$originalYear = null;
 		if (!$dateParts['year']) {
-			$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
+			$birthday = '1970-'.$dateParts['month'].'-'.$dateParts['date'];
 
 			$unknownYear = true;
 		} else {
@@ -230,14 +230,14 @@ 
 			if (isset($parameters['X-APPLE-OMIT-YEAR'])) {
 				$omitYear = $parameters['X-APPLE-OMIT-YEAR'];
 				if ($dateParts['year'] === $omitYear) {
-					$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
+					$birthday = '1970-'.$dateParts['month'].'-'.$dateParts['date'];
 					$unknownYear = true;
 				}
 			} else {
-				$originalYear = (int)$dateParts['year'];
+				$originalYear = (int) $dateParts['year'];
 
 				if ($originalYear < 1970) {
-					$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
+					$birthday = '1970-'.$dateParts['month'].'-'.$dateParts['date'];
 				}
 			}
 		}
@@ -272,7 +272,7 @@ 
 		);
 
 		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID . $postfix;
+		$vEvent->{'UID'} = $doc->UID.$postfix;
 		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
 		$vEvent->{'SUMMARY'} = $summary;
 		$vEvent->{'TRANSP'} = 'TRANSPARENT';
@@ -298,7 +298,7 @@ 
 		$calendar = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
 		$calendarObjects = $this->calDavBackEnd->getCalendarObjects($calendar['id'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
 
-		foreach($calendarObjects as $calendarObject) {
+		foreach ($calendarObjects as $calendarObject) {
 			$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
 		}
 	}
@@ -311,9 +311,9 @@ 
 		$principal = 'principals/users/'.$user;
 		$this->ensureCalendarExists($principal);
 		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
-		foreach($books as $book) {
+		foreach ($books as $book) {
 			$cards = $this->cardDavBackEnd->getCards($book['id']);
-			foreach($cards as $card) {
+			foreach ($cards as $card) {
 				$this->onCardChanged((int) $book['id'], $card['uri'], $card['carddata']);
 			}
 		}
@@ -372,7 +372,7 @@ 
 									array $book,
 									int $calendarId,
 									array $type):void {
-		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
+		$objectUri = $book['uri'].'-'.$cardUri.$type['postfix'].'.ics';
 		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix']);
 		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
 		if (is_null($calendarData)) {
@@ -427,53 +427,53 @@ 
 	 */
 	private function formatTitle(string $field,
 								 string $name,
-								 int $year=null,
-								 bool $supports4Byte=true):string {
+								 int $year = null,
+								 bool $supports4Byte = true):string {
 		if ($supports4Byte) {
 			switch ($field) {
 				case 'BDAY':
 					return implode('', [
 						'

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

Indentation +109 added lines, -109 removed lines

@@ -37,113 +37,113 @@
 
 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 = [];
-
-	/**
-	 * @var bool
-	 */
-	private $enabled=false;
-
-	/**
-	 * @var Server
-	 */
-	private $server;
-
-	/**
-	 * 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;
-		}
-	}
-
-	/**
-	 * 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;
-		}
-
-		$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;
-			}
-
-			$calendarHome->enableCachedSubscriptionsForThisRequest();
-		} catch(NotFound $ex) {
-			return;
-		}
-	}
-
-	/**
-	 * @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'];
-	}
-
-	/**
-	 * 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';
-	}
+    /**
+     * list of regular expressions for calendar user agents,
+     * that do not support subscriptions on their own
+     *
+     * @var string[]
+     */
+    const ENABLE_FOR_CLIENTS = [];
+
+    /**
+     * @var bool
+     */
+    private $enabled=false;
+
+    /**
+     * @var Server
+     */
+    private $server;
+
+    /**
+     * 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;
+        }
+    }
+
+    /**
+     * 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;
+        }
+
+        $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;
+            }
+
+            $calendarHome->enableCachedSubscriptionsForThisRequest();
+        } catch(NotFound $ex) {
+            return;
+        }
+    }
+
+    /**
+     * @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'];
+    }
+
+    /**
+     * 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/Connector/Sabre/ServerFactory.php

Indentation +161 added lines, -161 removed lines

@@ -47,176 +47,176 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class ServerFactory {
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-	/** @var IDBConnection */
-	private $databaseConnection;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMountManager */
-	private $mountManager;
-	/** @var ITagManager */
-	private $tagManager;
-	/** @var IRequest */
-	private $request;
-	/** @var IPreview  */
-	private $previewManager;
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+    /** @var IDBConnection */
+    private $databaseConnection;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IMountManager */
+    private $mountManager;
+    /** @var ITagManager */
+    private $tagManager;
+    /** @var IRequest */
+    private $request;
+    /** @var IPreview  */
+    private $previewManager;
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
 
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param IDBConnection $databaseConnection
-	 * @param IUserSession $userSession
-	 * @param IMountManager $mountManager
-	 * @param ITagManager $tagManager
-	 * @param IRequest $request
-	 * @param IPreview $previewManager
-	 */
-	public function __construct(
-		IConfig $config,
-		ILogger $logger,
-		IDBConnection $databaseConnection,
-		IUserSession $userSession,
-		IMountManager $mountManager,
-		ITagManager $tagManager,
-		IRequest $request,
-		IPreview $previewManager,
-		EventDispatcherInterface $eventDispatcher
-	) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->databaseConnection = $databaseConnection;
-		$this->userSession = $userSession;
-		$this->mountManager = $mountManager;
-		$this->tagManager = $tagManager;
-		$this->request = $request;
-		$this->previewManager = $previewManager;
-		$this->eventDispatcher = $eventDispatcher;
-	}
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param IDBConnection $databaseConnection
+     * @param IUserSession $userSession
+     * @param IMountManager $mountManager
+     * @param ITagManager $tagManager
+     * @param IRequest $request
+     * @param IPreview $previewManager
+     */
+    public function __construct(
+        IConfig $config,
+        ILogger $logger,
+        IDBConnection $databaseConnection,
+        IUserSession $userSession,
+        IMountManager $mountManager,
+        ITagManager $tagManager,
+        IRequest $request,
+        IPreview $previewManager,
+        EventDispatcherInterface $eventDispatcher
+    ) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->databaseConnection = $databaseConnection;
+        $this->userSession = $userSession;
+        $this->mountManager = $mountManager;
+        $this->tagManager = $tagManager;
+        $this->request = $request;
+        $this->previewManager = $previewManager;
+        $this->eventDispatcher = $eventDispatcher;
+    }
 
-	/**
-	 * @param string $baseUri
-	 * @param string $requestUri
-	 * @param Plugin $authPlugin
-	 * @param callable $viewCallBack callback that should return the view for the dav endpoint
-	 * @return Server
-	 */
-	public function createServer($baseUri,
-								 $requestUri,
-								 Plugin $authPlugin,
-								 callable $viewCallBack) {
-		// Fire up server
-		$objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree();
-		$server = new \OCA\DAV\Connector\Sabre\Server($objectTree);
-		// Set URL explicitly due to reverse-proxy situations
-		$server->httpRequest->setUrl($requestUri);
-		$server->setBaseUri($baseUri);
+    /**
+     * @param string $baseUri
+     * @param string $requestUri
+     * @param Plugin $authPlugin
+     * @param callable $viewCallBack callback that should return the view for the dav endpoint
+     * @return Server
+     */
+    public function createServer($baseUri,
+                                    $requestUri,
+                                    Plugin $authPlugin,
+                                    callable $viewCallBack) {
+        // Fire up server
+        $objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree();
+        $server = new \OCA\DAV\Connector\Sabre\Server($objectTree);
+        // Set URL explicitly due to reverse-proxy situations
+        $server->httpRequest->setUrl($requestUri);
+        $server->setBaseUri($baseUri);
 
-		// Load plugins
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config));
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin());
-		$server->addPlugin($authPlugin);
-		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		// 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($this->request->isUserAgent([
-				'/WebDAVFS/',
-				'/OneNote/',
-				'/Microsoft-WebDAV-MiniRedir/',
-		])) {
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin());
-		}
+        // Load plugins
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config));
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin());
+        $server->addPlugin($authPlugin);
+        // FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        // 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($this->request->isUserAgent([
+                '/WebDAVFS/',
+                '/OneNote/',
+                '/Microsoft-WebDAV-MiniRedir/',
+        ])) {
+            $server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
-			$server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
+            $server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) {
-			// ensure the skeleton is copied
-			$userFolder = \OC::$server->getUserFolder();
+        // wait with registering these until auth is handled and the filesystem is setup
+        $server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) {
+            // ensure the skeleton is copied
+            $userFolder = \OC::$server->getUserFolder();
 
-			/** @var \OC\Files\View $view */
-			$view = $viewCallBack($server);
-			if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) {
-				$rootInfo = $userFolder;
-			} else {
-				$rootInfo = $view->getFileInfo('');
-			}
+            /** @var \OC\Files\View $view */
+            $view = $viewCallBack($server);
+            if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) {
+                $rootInfo = $userFolder;
+            } else {
+                $rootInfo = $view->getFileInfo('');
+            }
 
-			// Create Nextcloud Dir
-			if ($rootInfo->getType() === 'dir') {
-				$root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree);
-			} else {
-				$root = new \OCA\DAV\Connector\Sabre\File($view, $rootInfo);
-			}
-			$objectTree->init($root, $view, $this->mountManager);
+            // Create Nextcloud Dir
+            if ($rootInfo->getType() === 'dir') {
+                $root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree);
+            } else {
+                $root = new \OCA\DAV\Connector\Sabre\File($view, $rootInfo);
+            }
+            $objectTree->init($root, $view, $this->mountManager);
 
-			$server->addPlugin(
-				new \OCA\DAV\Connector\Sabre\FilesPlugin(
-					$objectTree,
-					$this->config,
-					$this->request,
-					$this->previewManager,
-					false,
-					!$this->config->getSystemValue('debug', false)
-				)
-			);
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view, true));
+            $server->addPlugin(
+                new \OCA\DAV\Connector\Sabre\FilesPlugin(
+                    $objectTree,
+                    $this->config,
+                    $this->request,
+                    $this->previewManager,
+                    false,
+                    !$this->config->getSystemValue('debug', false)
+                )
+            );
+            $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view, true));
 
-			if($this->userSession->isLoggedIn()) {
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin(
-					$objectTree,
-					$this->userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin(\OC::$server->getCommentsManager(), $this->userSession));
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\FilesReportPlugin(
-					$objectTree,
-					$view,
-					\OC::$server->getSystemTagManager(),
-					\OC::$server->getSystemTagObjectMapper(),
-					\OC::$server->getTagManager(),
-					$this->userSession,
-					\OC::$server->getGroupManager(),
-					$userFolder,
-					\OC::$server->getAppManager()
-				));
-				// custom properties plugin must be the last one
-				$server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new \OCA\DAV\DAV\CustomPropertiesBackend(
-							$objectTree,
-							$this->databaseConnection,
-							$this->userSession->getUser()
-						)
-					)
-				);
-			}
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin());
+            if($this->userSession->isLoggedIn()) {
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin(
+                    $objectTree,
+                    $this->userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin(\OC::$server->getCommentsManager(), $this->userSession));
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\FilesReportPlugin(
+                    $objectTree,
+                    $view,
+                    \OC::$server->getSystemTagManager(),
+                    \OC::$server->getSystemTagObjectMapper(),
+                    \OC::$server->getTagManager(),
+                    $this->userSession,
+                    \OC::$server->getGroupManager(),
+                    $userFolder,
+                    \OC::$server->getAppManager()
+                ));
+                // custom properties plugin must be the last one
+                $server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new \OCA\DAV\DAV\CustomPropertiesBackend(
+                            $objectTree,
+                            $this->databaseConnection,
+                            $this->userSession->getUser()
+                        )
+                    )
+                );
+            }
+            $server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin());
 
-			// Load dav plugins from apps
-			$event = new SabrePluginEvent($server);
-			$this->eventDispatcher->dispatch($event);
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OC::$server->getAppManager()
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$server->addPlugin($appPlugin);
-			}
+            // Load dav plugins from apps
+            $event = new SabrePluginEvent($server);
+            $this->eventDispatcher->dispatch($event);
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OC::$server->getAppManager()
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $server->addPlugin($appPlugin);
+            }
 
-		}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
-		return $server;
-	}
+        }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
+        return $server;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
 		// 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($this->request->isUserAgent([
+		if ($this->request->isUserAgent([
 				'/WebDAVFS/',
 				'/OneNote/',
 				'/Microsoft-WebDAV-MiniRedir/',
@@ -140,7 +140,7 @@ 
 		}
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) {
+		$server->on('beforeMethod:*', function() use ($server, $objectTree, $viewCallBack) {
 			// ensure the skeleton is copied
 			$userFolder = \OC::$server->getUserFolder();
 
@@ -172,7 +172,7 @@ 
 			);
 			$server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view, true));
 
-			if($this->userSession->isLoggedIn()) {
+			if ($this->userSession->isLoggedIn()) {
 				$server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
 				$server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin(
 					$objectTree,

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

Indentation +48 added lines, -48 removed lines

@@ -34,58 +34,58 @@
  */
 class AppEnabledPlugin extends ServerPlugin {
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var string
-	 */
-	private $app;
+    /**
+     * @var string
+     */
+    private $app;
 
-	/**
-	 * @var \OCP\App\IAppManager
-	 */
-	private $appManager;
+    /**
+     * @var \OCP\App\IAppManager
+     */
+    private $appManager;
 
-	/**
-	 * @param string $app
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($app, IAppManager $appManager) {
-		$this->app = $app;
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $app
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($app, IAppManager $appManager) {
+        $this->app = $app;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * 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 \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * 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 \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$this->server = $server;
-		$this->server->on('beforeMethod:*', [$this, 'checkAppEnabled'], 30);
-	}
+        $this->server = $server;
+        $this->server->on('beforeMethod:*', [$this, 'checkAppEnabled'], 30);
+    }
 
-	/**
-	 * This method is called before any HTTP after auth and checks if the user has access to the app
-	 *
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @return bool
-	 */
-	public function checkAppEnabled() {
-		if (!$this->appManager->isEnabledForUser($this->app)) {
-			throw new Forbidden();
-		}
-	}
+    /**
+     * This method is called before any HTTP after auth and checks if the user has access to the app
+     *
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @return bool
+     */
+    public function checkAppEnabled() {
+        if (!$this->appManager->isEnabledForUser($this->app)) {
+            throw new Forbidden();
+        }
+    }
 }

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

Indentation +46 added lines, -46 removed lines

@@ -33,53 +33,53 @@
 use Sabre\HTTP\RequestInterface;
 
 class LockPlugin extends ServerPlugin {
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod:*', [$this, 'getLock'], 50);
-		$this->server->on('afterMethod', [$this, 'releaseLock'], 50);
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod:*', [$this, 'getLock'], 50);
+        $this->server->on('afterMethod', [$this, 'releaseLock'], 50);
+    }
 
-	public function getLock(RequestInterface $request) {
-		// we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
-		// so instead we limit ourselves to the PUT method manually
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			try {
-				$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-		}
-	}
+    public function getLock(RequestInterface $request) {
+        // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+        // so instead we limit ourselves to the PUT method manually
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            try {
+                $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+    }
 
-	public function releaseLock(RequestInterface $request) {
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-		}
-	}
+    public function releaseLock(RequestInterface $request) {
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+        }
+    }
 }