nextcloud / server

remote.php

Indentation +107 added lines, -107 removed lines

@@ -50,43 +50,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);
+        }
+    }
 }
 
 /**
@@ -94,80 +94,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 +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use Sabre\DAV\Exception\ServiceUnavailable;
@@ -60,7 +60,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:
@@ -108,11 +108,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
@@ -133,18 +133,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;
@@ -153,17 +153,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/Comments/CommentNode.php

Indentation +241 added lines, -241 removed lines

@@ -35,270 +35,270 @@
 use Sabre\DAV\PropPatch;
 
 class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
-	const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
-	const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
-	const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
-	const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
-	const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
-	const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
-	const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
+    const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
+    const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
+    const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
+    const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
+    const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
+    const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
+    const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
+    const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
 
-	/** @var  IComment */
-	public $comment;
+    /** @var  IComment */
+    public $comment;
 
-	/** @var ICommentsManager */
-	protected $commentsManager;
+    /** @var ICommentsManager */
+    protected $commentsManager;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	/** @var array list of properties with key being their name and value their setter */
-	protected $properties = [];
+    /** @var array list of properties with key being their name and value their setter */
+    protected $properties = [];
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IUserSession */
-	protected $userSession;
+    /** @var IUserSession */
+    protected $userSession;
 
-	/**
-	 * CommentNode constructor.
-	 *
-	 * @param ICommentsManager $commentsManager
-	 * @param IComment $comment
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		ICommentsManager $commentsManager,
-		IComment $comment,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		$this->commentsManager = $commentsManager;
-		$this->comment = $comment;
-		$this->logger = $logger;
+    /**
+     * CommentNode constructor.
+     *
+     * @param ICommentsManager $commentsManager
+     * @param IComment $comment
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     */
+    public function __construct(
+        ICommentsManager $commentsManager,
+        IComment $comment,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        $this->commentsManager = $commentsManager;
+        $this->comment = $comment;
+        $this->logger = $logger;
 
-		$methods = get_class_methods($this->comment);
-		$methods = array_filter($methods, function ($name) {
-			return strpos($name, 'get') === 0;
-		});
-		foreach($methods as $getter) {
-			if($getter === 'getMentions') {
-				continue;	// special treatment
-			}
-			$name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
-			$this->properties[$name] = $getter;
-		}
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-	}
+        $methods = get_class_methods($this->comment);
+        $methods = array_filter($methods, function ($name) {
+            return strpos($name, 'get') === 0;
+        });
+        foreach($methods as $getter) {
+            if($getter === 'getMentions') {
+                continue;	// special treatment
+            }
+            $name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
+            $this->properties[$name] = $getter;
+        }
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * returns a list of all possible property names
-	 *
-	 * @return array
-	 */
-	static public function getPropertyNames() {
-		return [
-			'{http://owncloud.org/ns}id',
-			'{http://owncloud.org/ns}parentId',
-			'{http://owncloud.org/ns}topmostParentId',
-			'{http://owncloud.org/ns}childrenCount',
-			'{http://owncloud.org/ns}verb',
-			'{http://owncloud.org/ns}actorType',
-			'{http://owncloud.org/ns}actorId',
-			'{http://owncloud.org/ns}creationDateTime',
-			'{http://owncloud.org/ns}latestChildDateTime',
-			'{http://owncloud.org/ns}objectType',
-			'{http://owncloud.org/ns}objectId',
-			// re-used property names are defined as constants
-			self::PROPERTY_NAME_MESSAGE,
-			self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
-			self::PROPERTY_NAME_UNREAD,
-			self::PROPERTY_NAME_MENTIONS,
-			self::PROPERTY_NAME_MENTION,
-			self::PROPERTY_NAME_MENTION_TYPE,
-			self::PROPERTY_NAME_MENTION_ID,
-			self::PROPERTY_NAME_MENTION_DISPLAYNAME,
-		];
-	}
+    /**
+     * returns a list of all possible property names
+     *
+     * @return array
+     */
+    static public function getPropertyNames() {
+        return [
+            '{http://owncloud.org/ns}id',
+            '{http://owncloud.org/ns}parentId',
+            '{http://owncloud.org/ns}topmostParentId',
+            '{http://owncloud.org/ns}childrenCount',
+            '{http://owncloud.org/ns}verb',
+            '{http://owncloud.org/ns}actorType',
+            '{http://owncloud.org/ns}actorId',
+            '{http://owncloud.org/ns}creationDateTime',
+            '{http://owncloud.org/ns}latestChildDateTime',
+            '{http://owncloud.org/ns}objectType',
+            '{http://owncloud.org/ns}objectId',
+            // re-used property names are defined as constants
+            self::PROPERTY_NAME_MESSAGE,
+            self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
+            self::PROPERTY_NAME_UNREAD,
+            self::PROPERTY_NAME_MENTIONS,
+            self::PROPERTY_NAME_MENTION,
+            self::PROPERTY_NAME_MENTION_TYPE,
+            self::PROPERTY_NAME_MENTION_ID,
+            self::PROPERTY_NAME_MENTION_DISPLAYNAME,
+        ];
+    }
 
-	protected function checkWriteAccessOnComment() {
-		$user = $this->userSession->getUser();
-		if($this->comment->getActorType() !== 'users'
-			|| is_null($user)
-			|| $this->comment->getActorId() !== $user->getUID()
-		) {
-			throw new Forbidden('Only authors are allowed to edit their comment.');
-		}
-	}
+    protected function checkWriteAccessOnComment() {
+        $user = $this->userSession->getUser();
+        if($this->comment->getActorType() !== 'users'
+            || is_null($user)
+            || $this->comment->getActorId() !== $user->getUID()
+        ) {
+            throw new Forbidden('Only authors are allowed to edit their comment.');
+        }
+    }
 
-	/**
-	 * Deleted the current node
-	 *
-	 * @return void
-	 */
-	function delete() {
-		$this->checkWriteAccessOnComment();
-		$this->commentsManager->delete($this->comment->getId());
-	}
+    /**
+     * Deleted the current node
+     *
+     * @return void
+     */
+    function delete() {
+        $this->checkWriteAccessOnComment();
+        $this->commentsManager->delete($this->comment->getId());
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	function getName() {
-		return $this->comment->getId();
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    function getName() {
+        return $this->comment->getId();
+    }
 
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws MethodNotAllowed
-	 */
-	function setName($name) {
-		throw new MethodNotAllowed();
-	}
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws MethodNotAllowed
+     */
+    function setName($name) {
+        throw new MethodNotAllowed();
+    }
 
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	function getLastModified() {
-		return null;
-	}
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified() {
+        return null;
+    }
 
-	/**
-	 * update the comment's message
-	 *
-	 * @param $propertyValue
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws \Exception
-	 */
-	public function updateComment($propertyValue) {
-		$this->checkWriteAccessOnComment();
-		try {
-			$this->comment->setMessage($propertyValue);
-			$this->commentsManager->save($this->comment);
-			return true;
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'dav/comments']);
-			if($e instanceof MessageTooLongException) {
-				$msg = 'Message exceeds allowed character limit of ';
-				throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
-			}
-			throw $e;
-		}
-	}
+    /**
+     * update the comment's message
+     *
+     * @param $propertyValue
+     * @return bool
+     * @throws BadRequest
+     * @throws \Exception
+     */
+    public function updateComment($propertyValue) {
+        $this->checkWriteAccessOnComment();
+        try {
+            $this->comment->setMessage($propertyValue);
+            $this->commentsManager->save($this->comment);
+            return true;
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'dav/comments']);
+            if($e instanceof MessageTooLongException) {
+                $msg = 'Message exceeds allowed character limit of ';
+                throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
+            }
+            throw $e;
+        }
+    }
 
-	/**
-	 * Updates properties on this node.
-	 *
-	 * This method received a PropPatch object, which contains all the
-	 * information about the update.
-	 *
-	 * To update specific properties, call the 'handle' method on this object.
-	 * Read the PropPatch documentation for more information.
-	 *
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	function propPatch(PropPatch $propPatch) {
-		// other properties than 'message' are read only
-		$propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
-	}
+    /**
+     * Updates properties on this node.
+     *
+     * This method received a PropPatch object, which contains all the
+     * information about the update.
+     *
+     * To update specific properties, call the 'handle' method on this object.
+     * Read the PropPatch documentation for more information.
+     *
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    function propPatch(PropPatch $propPatch) {
+        // other properties than 'message' are read only
+        $propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
+    }
 
-	/**
-	 * Returns a list of properties for this nodes.
-	 *
-	 * The properties list is a list of propertynames the client requested,
-	 * encoded in clark-notation {xmlnamespace}tagname
-	 *
-	 * If the array is empty, it means 'all properties' were requested.
-	 *
-	 * Note that it's fine to liberally give properties back, instead of
-	 * conforming to the list of requested properties.
-	 * The Server class will filter out the extra.
-	 *
-	 * @param array $properties
-	 * @return array
-	 */
-	function getProperties($properties) {
-		$properties = array_keys($this->properties);
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * Note that it's fine to liberally give properties back, instead of
+     * conforming to the list of requested properties.
+     * The Server class will filter out the extra.
+     *
+     * @param array $properties
+     * @return array
+     */
+    function getProperties($properties) {
+        $properties = array_keys($this->properties);
 
-		$result = [];
-		foreach($properties as $property) {
-			$getter = $this->properties[$property];
-			if(method_exists($this->comment, $getter)) {
-				$result[$property] = $this->comment->$getter();
-			}
-		}
+        $result = [];
+        foreach($properties as $property) {
+            $getter = $this->properties[$property];
+            if(method_exists($this->comment, $getter)) {
+                $result[$property] = $this->comment->$getter();
+            }
+        }
 
-		if($this->comment->getActorType() === 'users') {
-			$user = $this->userManager->get($this->comment->getActorId());
-			$displayName = is_null($user) ? null : $user->getDisplayName();
-			$result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
-		}
+        if($this->comment->getActorType() === 'users') {
+            $user = $this->userManager->get($this->comment->getActorId());
+            $displayName = is_null($user) ? null : $user->getDisplayName();
+            $result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
+        }
 
-		$result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
+        $result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
 
-		$unread = null;
-		$user =  $this->userSession->getUser();
-		if(!is_null($user)) {
-			$readUntil = $this->commentsManager->getReadMark(
-				$this->comment->getObjectType(),
-				$this->comment->getObjectId(),
-				$user
-			);
-			if(is_null($readUntil)) {
-				$unread = 'true';
-			} else {
-				$unread = $this->comment->getCreationDateTime() > $readUntil;
-				// re-format for output
-				$unread = $unread ? 'true' : 'false';
-			}
-		}
-		$result[self::PROPERTY_NAME_UNREAD] = $unread;
+        $unread = null;
+        $user =  $this->userSession->getUser();
+        if(!is_null($user)) {
+            $readUntil = $this->commentsManager->getReadMark(
+                $this->comment->getObjectType(),
+                $this->comment->getObjectId(),
+                $user
+            );
+            if(is_null($readUntil)) {
+                $unread = 'true';
+            } else {
+                $unread = $this->comment->getCreationDateTime() > $readUntil;
+                // re-format for output
+                $unread = $unread ? 'true' : 'false';
+            }
+        }
+        $result[self::PROPERTY_NAME_UNREAD] = $unread;
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * transforms a mentions array as returned from IComment->getMentions to an
-	 * array with DAV-compatible structure that can be assigned to the
-	 * PROPERTY_NAME_MENTION property.
-	 *
-	 * @return array
-	 */
-	protected function composeMentionsPropertyValue() {
-		return array_map(function ($mention) {
-			try {
-				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
-			} catch (\OutOfBoundsException $e) {
-				$this->logger->logException($e);
-				// No displayname, upon client's discretion what to display.
-				$displayName = '';
-			}
+    /**
+     * transforms a mentions array as returned from IComment->getMentions to an
+     * array with DAV-compatible structure that can be assigned to the
+     * PROPERTY_NAME_MENTION property.
+     *
+     * @return array
+     */
+    protected function composeMentionsPropertyValue() {
+        return array_map(function ($mention) {
+            try {
+                $displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
+            } catch (\OutOfBoundsException $e) {
+                $this->logger->logException($e);
+                // No displayname, upon client's discretion what to display.
+                $displayName = '';
+            }
 
-			return [
-				self::PROPERTY_NAME_MENTION => [
-					self::PROPERTY_NAME_MENTION_TYPE        => $mention['type'],
-					self::PROPERTY_NAME_MENTION_ID          => $mention['id'],
-					self::PROPERTY_NAME_MENTION_DISPLAYNAME => $displayName,
-				]
-			];
-		}, $this->comment->getMentions());
-	}
+            return [
+                self::PROPERTY_NAME_MENTION => [
+                    self::PROPERTY_NAME_MENTION_TYPE        => $mention['type'],
+                    self::PROPERTY_NAME_MENTION_ID          => $mention['id'],
+                    self::PROPERTY_NAME_MENTION_DISPLAYNAME => $displayName,
+                ]
+            ];
+        }, $this->comment->getMentions());
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -85,14 +85,14 @@ 
 		$this->logger = $logger;
 
 		$methods = get_class_methods($this->comment);
-		$methods = array_filter($methods, function ($name) {
+		$methods = array_filter($methods, function($name) {
 			return strpos($name, 'get') === 0;
 		});
-		foreach($methods as $getter) {
-			if($getter === 'getMentions') {
-				continue;	// special treatment
+		foreach ($methods as $getter) {
+			if ($getter === 'getMentions') {
+				continue; // special treatment
 			}
-			$name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
+			$name = '{'.self::NS_OWNCLOUD.'}'.lcfirst(substr($getter, 3));
 			$this->properties[$name] = $getter;
 		}
 		$this->userManager = $userManager;
@@ -131,7 +131,7 @@ 
 
 	protected function checkWriteAccessOnComment() {
 		$user = $this->userSession->getUser();
-		if($this->comment->getActorType() !== 'users'
+		if ($this->comment->getActorType() !== 'users'
 			|| is_null($user)
 			|| $this->comment->getActorId() !== $user->getUID()
 		) {
@@ -195,9 +195,9 @@ 
 			return true;
 		} catch (\Exception $e) {
 			$this->logger->logException($e, ['app' => 'dav/comments']);
-			if($e instanceof MessageTooLongException) {
+			if ($e instanceof MessageTooLongException) {
 				$msg = 'Message exceeds allowed character limit of ';
-				throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
+				throw new BadRequest($msg.IComment::MAX_MESSAGE_LENGTH, 0, $e);
 			}
 			throw $e;
 		}
@@ -239,14 +239,14 @@ 
 		$properties = array_keys($this->properties);
 
 		$result = [];
-		foreach($properties as $property) {
+		foreach ($properties as $property) {
 			$getter = $this->properties[$property];
-			if(method_exists($this->comment, $getter)) {
+			if (method_exists($this->comment, $getter)) {
 				$result[$property] = $this->comment->$getter();
 			}
 		}
 
-		if($this->comment->getActorType() === 'users') {
+		if ($this->comment->getActorType() === 'users') {
 			$user = $this->userManager->get($this->comment->getActorId());
 			$displayName = is_null($user) ? null : $user->getDisplayName();
 			$result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
@@ -255,14 +255,14 @@ 
 		$result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
 
 		$unread = null;
-		$user =  $this->userSession->getUser();
-		if(!is_null($user)) {
+		$user = $this->userSession->getUser();
+		if (!is_null($user)) {
 			$readUntil = $this->commentsManager->getReadMark(
 				$this->comment->getObjectType(),
 				$this->comment->getObjectId(),
 				$user
 			);
-			if(is_null($readUntil)) {
+			if (is_null($readUntil)) {
 				$unread = 'true';
 			} else {
 				$unread = $this->comment->getCreationDateTime() > $readUntil;
@@ -283,7 +283,7 @@ 
 	 * @return array
 	 */
 	protected function composeMentionsPropertyValue() {
-		return array_map(function ($mention) {
+		return array_map(function($mention) {
 			try {
 				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
 			} catch (\OutOfBoundsException $e) {

apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php

Indentation +132 added lines, -132 removed lines

@@ -39,136 +39,136 @@
  */
 class SystemTagsObjectTypeCollection implements ICollection {
 
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var \Closure
-	 **/
-	protected $childExistsFunction;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $objectType object type
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param \Closure $childExistsFunction
-	 */
-	public function __construct(
-		$objectType,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		\Closure $childExistsFunction
-	) {
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->objectType = $objectType;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->childExistsFunction = $childExistsFunction;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Forbidden
-	 */
-	function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create nodes');
-	}
-
-	/**
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $objectId
-	 * @return SystemTagsObjectMappingCollection
-	 * @throws NotFound
-	 */
-	function getChild($objectId) {
-		// make sure the object exists and is reachable
-		if(!$this->childExists($objectId)) {
-			throw new NotFound('Entity does not exist or is not available');
-		}
-		return new SystemTagsObjectMappingCollection(
-			$objectId,
-			$this->objectType,
-			$this->userSession->getUser(),
-			$this->tagManager,
-			$this->tagMapper
-		);
-	}
-
-	function getChildren() {
-		// do not list object ids
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	function childExists($name) {
-		return call_user_func($this->childExistsFunction, $name);
-	}
-
-	function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	function getName() {
-		return $this->objectType;
-	}
-
-	/**
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	function getLastModified() {
-		return null;
-	}
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var \Closure
+     **/
+    protected $childExistsFunction;
+
+    /**
+     * Constructor
+     *
+     * @param string $objectType object type
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param \Closure $childExistsFunction
+     */
+    public function __construct(
+        $objectType,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        \Closure $childExistsFunction
+    ) {
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->objectType = $objectType;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->childExistsFunction = $childExistsFunction;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Forbidden
+     */
+    function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create nodes');
+    }
+
+    /**
+     * @param string $name
+     * @throws Forbidden
+     */
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $objectId
+     * @return SystemTagsObjectMappingCollection
+     * @throws NotFound
+     */
+    function getChild($objectId) {
+        // make sure the object exists and is reachable
+        if(!$this->childExists($objectId)) {
+            throw new NotFound('Entity does not exist or is not available');
+        }
+        return new SystemTagsObjectMappingCollection(
+            $objectId,
+            $this->objectType,
+            $this->userSession->getUser(),
+            $this->tagManager,
+            $this->tagMapper
+        );
+    }
+
+    function getChildren() {
+        // do not list object ids
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    function childExists($name) {
+        return call_user_func($this->childExistsFunction, $name);
+    }
+
+    function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    function getName() {
+        return $this->objectType;
+    }
+
+    /**
+     * @param string $name
+     * @throws Forbidden
+     */
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified() {
+        return null;
+    }
 }

apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php

Indentation +165 added lines, -165 removed lines

@@ -41,169 +41,169 @@
  */
 class SystemTagsObjectMappingCollection implements ICollection {
 
-	/**
-	 * @var string
-	 */
-	private $objectId;
-
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	private $user;
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $objectId object id
-	 * @param string $objectType object type
-	 * @param IUser $user user
-	 * @param ISystemTagManager $tagManager tag manager
-	 * @param ISystemTagObjectMapper $tagMapper tag mapper
-	 */
-	public function __construct(
-		$objectId,
-		$objectType,
-		IUser $user,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper
-	) {
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->objectId = $objectId;
-		$this->objectType = $objectType;
-		$this->user = $user;
-	}
-
-	function createFile($tagId, $data = null) {
-		try {
-			$tags = $this->tagManager->getTagsByIds([$tagId]);
-			$tag = current($tags);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-				throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
-			}
-			if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
-				throw new Forbidden('No permission to assign tag ' . $tagId);
-			}
-
-			$this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
-		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
-		}
-	}
-
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	function getChild($tagId) {
-		try {
-			if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
-				$tag = $this->tagManager->getTagsByIds([$tagId]);
-				$tag = current($tag);
-				if ($this->tagManager->canUserSeeTag($tag, $this->user)) {
-					return $this->makeNode($tag);
-				}
-			}
-			throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
-		}
-	}
-
-	function getChildren() {
-		$tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
-		if (empty($tagIds)) {
-			return [];
-		}
-		$tags = $this->tagManager->getTagsByIds($tagIds);
-
-		// filter out non-visible tags
-		$tags = array_filter($tags, function ($tag) {
-			return $this->tagManager->canUserSeeTag($tag, $this->user);
-		});
-
-		return array_values(array_map(function ($tag) {
-			return $this->makeNode($tag);
-		}, $tags));
-	}
-
-	function childExists($tagId) {
-		try {
-			$result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
-
-			if ($result) {
-				$tags = $this->tagManager->getTagsByIds([$tagId]);
-				$tag = current($tags);
-				if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-					return false;
-				}
-			}
-
-			return $result;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			return false;
-		}
-	}
-
-	function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	function getName() {
-		return $this->objectId;
-	}
-
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Create a sabre node for the mapping of the
-	 * given system tag to the collection's object
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagMappingNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagMappingNode(
-			$tag,
-			$this->objectId,
-			$this->objectType,
-			$this->user,
-			$this->tagManager,
-			$this->tagMapper
-		);
-	}
+    /**
+     * @var string
+     */
+    private $objectId;
+
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    private $user;
+
+
+    /**
+     * Constructor
+     *
+     * @param string $objectId object id
+     * @param string $objectType object type
+     * @param IUser $user user
+     * @param ISystemTagManager $tagManager tag manager
+     * @param ISystemTagObjectMapper $tagMapper tag mapper
+     */
+    public function __construct(
+        $objectId,
+        $objectType,
+        IUser $user,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper
+    ) {
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->objectId = $objectId;
+        $this->objectType = $objectType;
+        $this->user = $user;
+    }
+
+    function createFile($tagId, $data = null) {
+        try {
+            $tags = $this->tagManager->getTagsByIds([$tagId]);
+            $tag = current($tags);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
+                throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+            }
+            if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
+                throw new Forbidden('No permission to assign tag ' . $tagId);
+            }
+
+            $this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
+        } catch (TagNotFoundException $e) {
+            throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+        }
+    }
+
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    function getChild($tagId) {
+        try {
+            if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
+                $tag = $this->tagManager->getTagsByIds([$tagId]);
+                $tag = current($tag);
+                if ($this->tagManager->canUserSeeTag($tag, $this->user)) {
+                    return $this->makeNode($tag);
+                }
+            }
+            throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
+        }
+    }
+
+    function getChildren() {
+        $tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
+        if (empty($tagIds)) {
+            return [];
+        }
+        $tags = $this->tagManager->getTagsByIds($tagIds);
+
+        // filter out non-visible tags
+        $tags = array_filter($tags, function ($tag) {
+            return $this->tagManager->canUserSeeTag($tag, $this->user);
+        });
+
+        return array_values(array_map(function ($tag) {
+            return $this->makeNode($tag);
+        }, $tags));
+    }
+
+    function childExists($tagId) {
+        try {
+            $result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
+
+            if ($result) {
+                $tags = $this->tagManager->getTagsByIds([$tagId]);
+                $tag = current($tags);
+                if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
+                    return false;
+                }
+            }
+
+            return $result;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            return false;
+        }
+    }
+
+    function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    function getName() {
+        return $this->objectId;
+    }
+
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Create a sabre node for the mapping of the
+     * given system tag to the collection's object
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagMappingNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagMappingNode(
+            $tag,
+            $this->objectId,
+            $this->objectType,
+            $this->user,
+            $this->tagManager,
+            $this->tagMapper
+        );
+    }
 }

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

Indentation +39 added lines, -39 removed lines

@@ -29,59 +29,59 @@
 
 class ShareRequest implements XmlDeserializable {
 
-	public $set = [];
+    public $set = [];
 
-	public $remove = [];
+    public $remove = [];
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $set
-	 * @param array $remove
-	 */
-	function __construct(array $set, array $remove) {
+    /**
+     * Constructor
+     *
+     * @param array $set
+     * @param array $remove
+     */
+    function __construct(array $set, array $remove) {
 
-		$this->set = $set;
-		$this->remove = $remove;
+        $this->set = $set;
+        $this->remove = $remove;
 
-	}
+    }
 
-	static function xmlDeserialize(Reader $reader) {
+    static function xmlDeserialize(Reader $reader) {
 
-		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
+        $elements = $reader->parseInnerTree([
+            '{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+            '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
 
-		$set = [];
-		$remove = [];
+        $set = [];
+        $remove = [];
 
-		foreach ($elements as $elem) {
-			switch ($elem['name']) {
+        foreach ($elements as $elem) {
+            switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set':
-					$sharee = $elem['value'];
+                case '{' . Plugin::NS_OWNCLOUD . '}set':
+                    $sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+                    $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
+                    $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
 
-					$set[] = [
-						'href'       => $sharee['{DAV:}href'],
-						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-						'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
-					];
-					break;
+                    $set[] = [
+                        'href'       => $sharee['{DAV:}href'],
+                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
+                        'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
+                        'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+                    ];
+                    break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove':
-					$remove[] = $elem['value']['{DAV:}href'];
-					break;
+                case '{' . Plugin::NS_OWNCLOUD . '}remove':
+                    $remove[] = $elem['value']['{DAV:}href'];
+                    break;
 
-			}
-		}
+            }
+        }
 
-		return new self($set, $remove);
+        return new self($set, $remove);
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -49,8 +49,8 @@ 
 	static function xmlDeserialize(Reader $reader) {
 
 		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
 		]);
 
 		$set = [];
@@ -59,21 +59,21 @@ 
 		foreach ($elements as $elem) {
 			switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set':
+				case '{'.Plugin::NS_OWNCLOUD.'}set':
 					$sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+					$sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary';
+					$commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name';
 
 					$set[] = [
 						'href'       => $sharee['{DAV:}href'],
 						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
 						'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+						'readOnly'   => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee),
 					];
 					break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove':
+				case '{'.Plugin::NS_OWNCLOUD.'}remove':
 					$remove[] = $elem['value']['{DAV:}href'];
 					break;
 

apps/dav/lib/DAV/Sharing/Plugin.php

Indentation +162 added lines, -162 removed lines

@@ -38,167 +38,167 @@
 
 class Plugin extends ServerPlugin {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
-
-	/** @var Auth */
-	private $auth;
-
-	/** @var IRequest */
-	private $request;
-
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param Auth $authBackEnd
-	 * @param IRequest $request
-	 */
-	public function __construct(Auth $authBackEnd, IRequest $request) {
-		$this->auth = $authBackEnd;
-		$this->request = $request;
-	}
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * 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[]
-	 */
-	function getFeatures() {
-		return ['oc-resource-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	function getPluginName() {
-		return 'oc-resource-sharing';
-	}
-
-	/**
-	 * 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
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on a dav resource.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return null|false
-	 */
-	function httpPost(RequestInterface $request, ResponseInterface $response) {
-
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
-			return;
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			// Dealing with the 'share' document, which modified invitees on a
-			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share':
-
-				// We can only deal with IShareableCalendar objects
-				if (!$node instanceof IShareable) {
-					return;
-				}
-
-				$this->server->transactionType = 'post-oc-resource-share';
-
-				// Getting ACL info
-				$acl = $this->server->getPlugin('acl');
-
-				// If there's no ACL support, we allow everything
-				if ($acl) {
-					/** @var \Sabre\DAVACL\Plugin $acl */
-					$acl->checkPrivileges($path, '{DAV:}write');
-				}
-
-				$node->updateShares($message->set, $message->remove);
-
-				$response->setStatus(200);
-				// Adding this because sending a response body may cause issues,
-				// and I wanted some type of indicator the response was handled.
-				$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-				// Breaking the event chain
-				return false;
-		}
-	}
-
-	/**
-	 * This event is triggered when properties are requested for a certain
-	 * node.
-	 *
-	 * This allows us to inject any properties early.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IShareable) {
-
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
-				return new Invite(
-					$node->getShares()
-				);
-			});
-
-		}
-	}
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
+
+    /** @var Auth */
+    private $auth;
+
+    /** @var IRequest */
+    private $request;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param Auth $authBackEnd
+     * @param IRequest $request
+     */
+    public function __construct(Auth $authBackEnd, IRequest $request) {
+        $this->auth = $authBackEnd;
+        $this->request = $request;
+    }
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * 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[]
+     */
+    function getFeatures() {
+        return ['oc-resource-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    function getPluginName() {
+        return 'oc-resource-sharing';
+    }
+
+    /**
+     * 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
+     * @return void
+     */
+    function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on a dav resource.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return null|false
+     */
+    function httpPost(RequestInterface $request, ResponseInterface $response) {
+
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
+            return;
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            // Dealing with the 'share' document, which modified invitees on a
+            // calendar.
+            case '{' . self::NS_OWNCLOUD . '}share':
+
+                // We can only deal with IShareableCalendar objects
+                if (!$node instanceof IShareable) {
+                    return;
+                }
+
+                $this->server->transactionType = 'post-oc-resource-share';
+
+                // Getting ACL info
+                $acl = $this->server->getPlugin('acl');
+
+                // If there's no ACL support, we allow everything
+                if ($acl) {
+                    /** @var \Sabre\DAVACL\Plugin $acl */
+                    $acl->checkPrivileges($path, '{DAV:}write');
+                }
+
+                $node->updateShares($message->set, $message->remove);
+
+                $response->setStatus(200);
+                // Adding this because sending a response body may cause issues,
+                // and I wanted some type of indicator the response was handled.
+                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+                // Breaking the event chain
+                return false;
+        }
+    }
+
+    /**
+     * This event is triggered when properties are requested for a certain
+     * node.
+     *
+     * This allows us to inject any properties early.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IShareable) {
+
+            $propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
+                return new Invite(
+                    $node->getShares()
+                );
+            });
+
+        }
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -102,11 +102,11 @@ 
 	 */
 	function initialize(Server $server) {
 		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+		$this->server->xml->elementMap['{'.Plugin::NS_OWNCLOUD.'}share'] = ShareRequest::class;
+		$this->server->xml->elementMap['{'.Plugin::NS_OWNCLOUD.'}invite'] = Invite::class;
 
 		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
+		$this->server->on('propFind', [$this, 'propFind']);
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 
 			// Dealing with the 'share' document, which modified invitees on a
 			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share':
+			case '{'.self::NS_OWNCLOUD.'}share':
 
 				// We can only deal with IShareableCalendar objects
 				if (!$node instanceof IShareable) {
@@ -192,7 +192,7 @@ 
 	function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof IShareable) {
 
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
+			$propFind->handle('{'.Plugin::NS_OWNCLOUD.'}invite', function() use ($node) {
 				return new Invite(
 					$node->getShares()
 				);

apps/dav/lib/Command/MoveCalendar.php

Indentation +144 added lines, -144 removed lines

@@ -41,148 +41,148 @@
 
 class MoveCalendar extends Command {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IShareManager */
-	private $shareManager;
-
-	/** @var IConfig $config */
-	private $config;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var SymfonyStyle */
-	private $io;
-
-	/** @var CalDavBackend */
-	private $calDav;
-
-	const URI_USERS = 'principals/users/';
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IShareManager $shareManager
-	 * @param IConfig $config
-	 * @param IL10N $l10n
-	 * @param CalDavBackend $calDav
-	 */
-	function __construct(
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		IShareManager $shareManager,
-		IConfig $config,
-		IL10N $l10n,
-		CalDavBackend $calDav
-	) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->shareManager = $shareManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->calDav = $calDav;
-	}
-
-	protected function configure() {
-		$this
-			->setName('dav:move-calendar')
-			->setDescription('Move a calendar from an user to another')
-			->addArgument('name',
-				InputArgument::REQUIRED,
-				'Name of the calendar to move')
-			->addArgument('sourceuid',
-				InputArgument::REQUIRED,
-				'User who currently owns the calendar')
-			->addArgument('destinationuid',
-				InputArgument::REQUIRED,
-				'User who will receive the calendar')
-			->addOption('force', 'f', InputOption::VALUE_NONE, "Force the migration by removing existing shares");
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$userOrigin = $input->getArgument('sourceuid');
-		$userDestination = $input->getArgument('destinationuid');
-
-		$this->io = new SymfonyStyle($input, $output);
-
-		if (!$this->userManager->userExists($userOrigin)) {
-			throw new \InvalidArgumentException("User <$userOrigin> is unknown.");
-		}
-
-		if (!$this->userManager->userExists($userDestination)) {
-			throw new \InvalidArgumentException("User <$userDestination> is unknown.");
-		}
-
-		$name = $input->getArgument('name');
-
-		$calendar = $this->calDav->getCalendarByUri(self::URI_USERS . $userOrigin, $name);
-
-		if (null === $calendar) {
-			throw new \InvalidArgumentException("User <$userOrigin> has no calendar named <$name>. You can run occ dav:list-calendars to list calendars URIs for this user.");
-		}
-
-		if (null !== $this->calDav->getCalendarByUri(self::URI_USERS . $userDestination, $name)) {
-			throw new \InvalidArgumentException("User <$userDestination> already has a calendar named <$name>.");
-		}
-
-		$this->checkShares($calendar, $userOrigin, $userDestination, $input->getOption('force'));
-
-		$this->calDav->moveCalendar($name, self::URI_USERS . $userOrigin, self::URI_USERS . $userDestination);
-
-		$this->io->success("Calendar <$name> was moved from user <$userOrigin> to <$userDestination>");
-	}
-
-	/**
-	 * Check that moving the calendar won't break shares
-	 *
-	 * @param array $calendar
-	 * @param string $userOrigin
-	 * @param string $userDestination
-	 * @param bool $force
-	 */
-	private function checkShares(array $calendar, string $userOrigin, string $userDestination, bool $force = false)
-	{
-		$shares = $this->calDav->getShares($calendar['id']);
-		foreach ($shares as $share) {
-			list(, $prefix, $userOrGroup) = explode('/', $share['href'], 3);
-
-			/**
-			 * Check that user destination is member of the groups which whom the calendar was shared
-			 * If we ask to force the migration, the share with the group is dropped
-			 */
-			if ($this->shareManager->shareWithGroupMembersOnly() === true && 'groups' === $prefix && !$this->groupManager->isInGroup($userDestination, $userOrGroup)) {
-				if ($force) {
-					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/groups/' . $userOrGroup]);
-				} else {
-					throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$userOrGroup> with whom the calendar <" . $calendar['uri'] . "> was shared. You may use -f to move the calendar while deleting this share.");
-				}
-			}
-
-			/**
-			 * Check that calendar isn't already shared with user destination
-			 */
-			if ($userOrGroup === $userDestination) {
-				if ($force) {
-					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/users/' . $userOrGroup]);
-				} else {
-					throw new \InvalidArgumentException("The calendar <" . $calendar['uri'] . "> is already shared to user <$userDestination>.You may use -f to move the calendar while deleting this share.");
-				}
-			}
-		}
-		/**
-		 * Warn that share links have changed if there are shares
-		 */
-		if (count($shares) > 0) {
-			$this->io->note([
-				"Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
-				"Sharees will need to change \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userDestination\""
-			]);
-		}
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IShareManager */
+    private $shareManager;
+
+    /** @var IConfig $config */
+    private $config;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var SymfonyStyle */
+    private $io;
+
+    /** @var CalDavBackend */
+    private $calDav;
+
+    const URI_USERS = 'principals/users/';
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IShareManager $shareManager
+     * @param IConfig $config
+     * @param IL10N $l10n
+     * @param CalDavBackend $calDav
+     */
+    function __construct(
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        IShareManager $shareManager,
+        IConfig $config,
+        IL10N $l10n,
+        CalDavBackend $calDav
+    ) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->shareManager = $shareManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->calDav = $calDav;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('dav:move-calendar')
+            ->setDescription('Move a calendar from an user to another')
+            ->addArgument('name',
+                InputArgument::REQUIRED,
+                'Name of the calendar to move')
+            ->addArgument('sourceuid',
+                InputArgument::REQUIRED,
+                'User who currently owns the calendar')
+            ->addArgument('destinationuid',
+                InputArgument::REQUIRED,
+                'User who will receive the calendar')
+            ->addOption('force', 'f', InputOption::VALUE_NONE, "Force the migration by removing existing shares");
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $userOrigin = $input->getArgument('sourceuid');
+        $userDestination = $input->getArgument('destinationuid');
+
+        $this->io = new SymfonyStyle($input, $output);
+
+        if (!$this->userManager->userExists($userOrigin)) {
+            throw new \InvalidArgumentException("User <$userOrigin> is unknown.");
+        }
+
+        if (!$this->userManager->userExists($userDestination)) {
+            throw new \InvalidArgumentException("User <$userDestination> is unknown.");
+        }
+
+        $name = $input->getArgument('name');
+
+        $calendar = $this->calDav->getCalendarByUri(self::URI_USERS . $userOrigin, $name);
+
+        if (null === $calendar) {
+            throw new \InvalidArgumentException("User <$userOrigin> has no calendar named <$name>. You can run occ dav:list-calendars to list calendars URIs for this user.");
+        }
+
+        if (null !== $this->calDav->getCalendarByUri(self::URI_USERS . $userDestination, $name)) {
+            throw new \InvalidArgumentException("User <$userDestination> already has a calendar named <$name>.");
+        }
+
+        $this->checkShares($calendar, $userOrigin, $userDestination, $input->getOption('force'));
+
+        $this->calDav->moveCalendar($name, self::URI_USERS . $userOrigin, self::URI_USERS . $userDestination);
+
+        $this->io->success("Calendar <$name> was moved from user <$userOrigin> to <$userDestination>");
+    }
+
+    /**
+     * Check that moving the calendar won't break shares
+     *
+     * @param array $calendar
+     * @param string $userOrigin
+     * @param string $userDestination
+     * @param bool $force
+     */
+    private function checkShares(array $calendar, string $userOrigin, string $userDestination, bool $force = false)
+    {
+        $shares = $this->calDav->getShares($calendar['id']);
+        foreach ($shares as $share) {
+            list(, $prefix, $userOrGroup) = explode('/', $share['href'], 3);
+
+            /**
+             * Check that user destination is member of the groups which whom the calendar was shared
+             * If we ask to force the migration, the share with the group is dropped
+             */
+            if ($this->shareManager->shareWithGroupMembersOnly() === true && 'groups' === $prefix && !$this->groupManager->isInGroup($userDestination, $userOrGroup)) {
+                if ($force) {
+                    $this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/groups/' . $userOrGroup]);
+                } else {
+                    throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$userOrGroup> with whom the calendar <" . $calendar['uri'] . "> was shared. You may use -f to move the calendar while deleting this share.");
+                }
+            }
+
+            /**
+             * Check that calendar isn't already shared with user destination
+             */
+            if ($userOrGroup === $userDestination) {
+                if ($force) {
+                    $this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/users/' . $userOrGroup]);
+                } else {
+                    throw new \InvalidArgumentException("The calendar <" . $calendar['uri'] . "> is already shared to user <$userDestination>.You may use -f to move the calendar while deleting this share.");
+                }
+            }
+        }
+        /**
+         * Warn that share links have changed if there are shares
+         */
+        if (count($shares) > 0) {
+            $this->io->note([
+                "Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
+                "Sharees will need to change \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userDestination\""
+            ]);
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -121,19 +121,19 @@ 
 
 		$name = $input->getArgument('name');
 
-		$calendar = $this->calDav->getCalendarByUri(self::URI_USERS . $userOrigin, $name);
+		$calendar = $this->calDav->getCalendarByUri(self::URI_USERS.$userOrigin, $name);
 
 		if (null === $calendar) {
 			throw new \InvalidArgumentException("User <$userOrigin> has no calendar named <$name>. You can run occ dav:list-calendars to list calendars URIs for this user.");
 		}
 
-		if (null !== $this->calDav->getCalendarByUri(self::URI_USERS . $userDestination, $name)) {
+		if (null !== $this->calDav->getCalendarByUri(self::URI_USERS.$userDestination, $name)) {
 			throw new \InvalidArgumentException("User <$userDestination> already has a calendar named <$name>.");
 		}
 
 		$this->checkShares($calendar, $userOrigin, $userDestination, $input->getOption('force'));
 
-		$this->calDav->moveCalendar($name, self::URI_USERS . $userOrigin, self::URI_USERS . $userDestination);
+		$this->calDav->moveCalendar($name, self::URI_USERS.$userOrigin, self::URI_USERS.$userDestination);
 
 		$this->io->success("Calendar <$name> was moved from user <$userOrigin> to <$userDestination>");
 	}
@@ -158,9 +158,9 @@ 
 			 */
 			if ($this->shareManager->shareWithGroupMembersOnly() === true && 'groups' === $prefix && !$this->groupManager->isInGroup($userDestination, $userOrGroup)) {
 				if ($force) {
-					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/groups/' . $userOrGroup]);
+					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/groups/'.$userOrGroup]);
 				} else {
-					throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$userOrGroup> with whom the calendar <" . $calendar['uri'] . "> was shared. You may use -f to move the calendar while deleting this share.");
+					throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$userOrGroup> with whom the calendar <".$calendar['uri']."> was shared. You may use -f to move the calendar while deleting this share.");
 				}
 			}
 
@@ -169,9 +169,9 @@ 
 			 */
 			if ($userOrGroup === $userDestination) {
 				if ($force) {
-					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/users/' . $userOrGroup]);
+					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/users/'.$userOrGroup]);
 				} else {
-					throw new \InvalidArgumentException("The calendar <" . $calendar['uri'] . "> is already shared to user <$userDestination>.You may use -f to move the calendar while deleting this share.");
+					throw new \InvalidArgumentException("The calendar <".$calendar['uri']."> is already shared to user <$userDestination>.You may use -f to move the calendar while deleting this share.");
 				}
 			}
 		}
@@ -180,8 +180,8 @@ 
 		 */
 		if (count($shares) > 0) {
 			$this->io->note([
-				"Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
-				"Sharees will need to change \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userDestination\""
+				"Please note that moving calendar ".$calendar['uri']." from user <$userOrigin> to <$userDestination> has caused share links to change.",
+				"Sharees will need to change \"example.com/remote.php/dav/calendars/uid/".$calendar['uri']."_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/".$calendar['uri']."_shared_by_$userDestination\""
 			]);
 		}
 	}

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

Indentation +190 added lines, -190 removed lines

@@ -40,197 +40,197 @@
 use Sabre\HTTP\ResponseInterface;
 
 class PublishPlugin extends ServerPlugin {
-	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * Config instance to get instance secret.
-	 *
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * URL Generator for absolute URLs.
-	 *
-	 * @var IURLGenerator
-	 */
-	protected $urlGenerator;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * 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() {
-		// May have to be changed to be detected
-		return ['oc-calendar-publishing', 'calendarserver-sharing'];
-	}
-
-	/**
-	 * 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() {
-		return 'oc-calendar-publishing';
-	}
-
-	/**
-	 * 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;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
-				if ($node->getPublishStatus()) {
-					// We return the publish-url only if the calendar is published.
-					$token = $node->getPublishStatus();
-					$publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
-
-					return new Publisher($publishUrl, true);
-				}
-			});
-
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
-				$canShare = (!$node->isSubscription() && $node->canWrite());
-				$canPublish = (!$node->isSubscription() && $node->canWrite());
-
-				return new AllowedSharingModes($canShare, $canPublish);
-			});
-		}
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendars.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return void|bool
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-publish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				$acl->checkPrivileges($path, '{DAV:}write');
-			}
-
-			$node->setPublishStatus(true);
-
-			// iCloud sends back the 202, so we will too.
-			$response->setStatus(202);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
-
-			case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-unpublish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				$acl->checkPrivileges($path, '{DAV:}write');
-			}
-
-			$node->setPublishStatus(false);
-
-			$response->setStatus(200);
+    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * Config instance to get instance secret.
+     *
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * URL Generator for absolute URLs.
+     *
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * 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() {
+        // May have to be changed to be detected
+        return ['oc-calendar-publishing', 'calendarserver-sharing'];
+    }
+
+    /**
+     * 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() {
+        return 'oc-calendar-publishing';
+    }
+
+    /**
+     * 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;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof Calendar) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+                if ($node->getPublishStatus()) {
+                    // We return the publish-url only if the calendar is published.
+                    $token = $node->getPublishStatus();
+                    $publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
+
+                    return new Publisher($publishUrl, true);
+                }
+            });
+
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
+                $canShare = (!$node->isSubscription() && $node->canWrite());
+                $canPublish = (!$node->isSubscription() && $node->canWrite());
+
+                return new AllowedSharingModes($canShare, $canPublish);
+            });
+        }
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendars.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return void|bool
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-publish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                $acl->checkPrivileges($path, '{DAV:}write');
+            }
+
+            $node->setPublishStatus(true);
+
+            // iCloud sends back the 202, so we will too.
+            $response->setStatus(202);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
+
+            case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-unpublish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                $acl->checkPrivileges($path, '{DAV:}write');
+            }
+
+            $node->setPublishStatus(false);
+
+            $response->setStatus(200);
 
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
 
-			// Breaking the event chain
-			return false;
+            // Breaking the event chain
+            return false;
 
-		}
-	}
+        }
+    }
 }

apps/dav/lib/CalDAV/CachedSubscription.php

Indentation +166 added lines, -166 removed lines

@@ -41,172 +41,172 @@
  */
 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,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			],
-		];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildACL():array {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-
-		];
-	}
-
-	/**
-	 * @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();
-	}
+    /**
+     * @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,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildACL():array {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+
+        ];
+    }
+
+    /**
+     * @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->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-		return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildren():array {
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-
-		$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->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-
-		$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->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		if (!$obj) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param array $filters
-	 * @return array
-	 */
-	public function calendarQuery(array $filters):array {
-		return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChanges($syncToken, $syncLevel, $limit = null) {
-		if (!$syncToken && $limit) {
-			throw new UnsupportedLimitOnInitialSyncException();
-		}
-
-		return parent::getChanges($syncToken, $syncLevel, $limit);
-	}
+    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->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+        return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildren():array {
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+
+        $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->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+
+        $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->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        if (!$obj) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $filters
+     * @return array
+     */
+    public function calendarQuery(array $filters):array {
+        return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChanges($syncToken, $syncLevel, $limit = null) {
+        if (!$syncToken && $limit) {
+            throw new UnsupportedLimitOnInitialSyncException();
+        }
+
+        return parent::getChanges($syncToken, $syncLevel, $limit);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -60,16 +60,16 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+				'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy',
 				'principal' => '{DAV:}authenticated',
 				'protected' => true,
 			],
@@ -89,12 +89,12 @@ 
 
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 
@@ -146,7 +146,7 @@ 
 		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
 
 		$children = [];
-		foreach($objs as $obj) {
+		foreach ($objs as $obj) {
 			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
 		}
 
@@ -161,7 +161,7 @@ 
 		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
 
 		$children = [];
-		foreach($objs as $obj) {
+		foreach ($objs as $obj) {
 			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
 		}