nextcloud / server

apps/dav/lib/SystemTag/SystemTagsByIdCollection.php

Indentation +140 added lines, -140 removed lines

@@ -37,144 +37,144 @@
 
 class SystemTagsByIdCollection implements ICollection {
 
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * SystemTagsByIdCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		ISystemTagManager $tagManager,
-		IUserSession $userSession,
-		IGroupManager $groupManager
-	) {
-		$this->tagManager = $tagManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 *
-	 * @return bool true if the user is an admin
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 * @throws Forbidden
-	 */
-	function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create tags by id');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	function getChild($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
-			}
-			return $this->makeNode($tag);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
-		}
-	}
-
-	function getChildren() {
-		$visibilityFilter = true;
-		if ($this->isAdmin()) {
-			$visibilityFilter = null;
-		}
-
-		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function($tag) {
-			return $this->makeNode($tag);
-		}, $tags);
-	}
-
-	/**
-	 * @param string $name
-	 */
-	function childExists($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				return false;
-			}
-			return true;
-		} 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 'systemtags';
-	}
-
-	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 given system tag
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
-	}
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * SystemTagsByIdCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        ISystemTagManager $tagManager,
+        IUserSession $userSession,
+        IGroupManager $groupManager
+    ) {
+        $this->tagManager = $tagManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     *
+     * @return bool true if the user is an admin
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     * @throws Forbidden
+     */
+    function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create tags by id');
+    }
+
+    /**
+     * @param string $name
+     */
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $name
+     */
+    function getChild($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                throw new NotFound('Tag with id ' . $name . ' not found');
+            }
+            return $this->makeNode($tag);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+        }
+    }
+
+    function getChildren() {
+        $visibilityFilter = true;
+        if ($this->isAdmin()) {
+            $visibilityFilter = null;
+        }
+
+        $tags = $this->tagManager->getAllTags($visibilityFilter);
+        return array_map(function($tag) {
+            return $this->makeNode($tag);
+        }, $tags);
+    }
+
+    /**
+     * @param string $name
+     */
+    function childExists($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                return false;
+            }
+            return true;
+        } 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 'systemtags';
+    }
+
+    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 given system tag
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -106,13 +106,13 @@
 			$tag = $this->tagManager->getTagsByIds([$name]);
 			$tag = current($tag);
 			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
+				throw new NotFound('Tag with id '.$name.' not found');
 			}
 			return $this->makeNode($tag);
 		} catch (\InvalidArgumentException $e) {
 			throw new BadRequest('Invalid tag id', 0, $e);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$name.' not found', 0, $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;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 	 */
 	function getChild($objectId) {
 		// make sure the object exists and is reachable
-		if(!$this->childExists($objectId)) {
+		if (!$this->childExists($objectId)) {
 			throw new NotFound('Entity does not exist or is not available');
 		}
 		return new SystemTagsObjectMappingCollection(

apps/dav/lib/SystemTag/SystemTagMappingNode.php

Indentation +130 added lines, -130 removed lines

@@ -37,134 +37,134 @@
  * Mapping node for system tag to object id
  */
 class SystemTagMappingNode implements \Sabre\DAV\INode {
-	/**
-	 * @var ISystemTag
-	 */
-	protected $tag;
-
-	/**
-	 * @var string
-	 */
-	private $objectId;
-
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	protected $user;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	protected $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param ISystemTag $tag system tag
-	 * @param string $objectId
-	 * @param string $objectType
-	 * @param IUser $user user
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 */
-	public function __construct(
-		ISystemTag $tag,
-		$objectId,
-		$objectType,
-		IUser $user,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper
-	) {
-		$this->tag = $tag;
-		$this->objectId = $objectId;
-		$this->objectType = $objectType;
-		$this->user = $user;
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-	}
-
-	/**
-	 * Returns the object id of the relationship
-	 *
-	 * @return string object id
-	 */
-	public function getObjectId() {
-		return $this->objectId;
-	}
-
-	/**
-	 * Returns the object type of the relationship
-	 *
-	 * @return string object type
-	 */
-	public function getObjectType() {
-		return $this->objectType;
-	}
-
-	/**
-	 * Returns the system tag represented by this node
-	 *
-	 * @return ISystemTag system tag
-	 */
-	public function getSystemTag() {
-		return $this->tag;
-	}
-
-	/**
-	 *  Returns the id of the tag
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->tag->getId();
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 *
-	 * @throws MethodNotAllowed not allowed to rename node
-	 */
-	public function setName($name) {
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Returns null, not supported
-	 *
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Delete tag to object association
-	 */
-	public function delete() {
-		try {
-			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
-			}
-			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
-			}
-			$this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
-		} catch (TagNotFoundException $e) {
-			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
-		}
-	}
+    /**
+     * @var ISystemTag
+     */
+    protected $tag;
+
+    /**
+     * @var string
+     */
+    private $objectId;
+
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    protected $user;
+
+    /**
+     * @var ISystemTagManager
+     */
+    protected $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param ISystemTag $tag system tag
+     * @param string $objectId
+     * @param string $objectType
+     * @param IUser $user user
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     */
+    public function __construct(
+        ISystemTag $tag,
+        $objectId,
+        $objectType,
+        IUser $user,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper
+    ) {
+        $this->tag = $tag;
+        $this->objectId = $objectId;
+        $this->objectType = $objectType;
+        $this->user = $user;
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+    }
+
+    /**
+     * Returns the object id of the relationship
+     *
+     * @return string object id
+     */
+    public function getObjectId() {
+        return $this->objectId;
+    }
+
+    /**
+     * Returns the object type of the relationship
+     *
+     * @return string object type
+     */
+    public function getObjectType() {
+        return $this->objectType;
+    }
+
+    /**
+     * Returns the system tag represented by this node
+     *
+     * @return ISystemTag system tag
+     */
+    public function getSystemTag() {
+        return $this->tag;
+    }
+
+    /**
+     *  Returns the id of the tag
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->tag->getId();
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     *
+     * @throws MethodNotAllowed not allowed to rename node
+     */
+    public function setName($name) {
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Returns null, not supported
+     *
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Delete tag to object association
+     */
+    public function delete() {
+        try {
+            if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
+                throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+            }
+            if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
+                throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
+            }
+            $this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
+        } catch (TagNotFoundException $e) {
+            // can happen if concurrent deletion occurred
+            throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -156,15 +156,15 @@
 	public function delete() {
 		try {
 			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+				throw new NotFound('Tag with id '.$this->tag->getId().' not found');
 			}
 			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
+				throw new Forbidden('No permission to unassign tag '.$this->tag->getId());
 			}
 			$this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
 		} catch (TagNotFoundException $e) {
 			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$this->tag->getId().' not found', 0, $e);
 		}
 	}
 }

apps/dav/lib/SystemTag/SystemTagPlugin.php

Spacing +6 added lines, -6 removed lines

@@ -135,7 +135,7 @@ 
 			if ($node instanceof SystemTagsObjectMappingCollection) {
 				// also add to collection
 				$node->createFile($tag->getId());
-				$url = $request->getBaseUrl() . 'systemtags/';
+				$url = $request->getBaseUrl().'systemtags/';
 			} else {
 				$url = $request->getUrl();
 			}
@@ -144,7 +144,7 @@ 
 				$url .= '/';
 			}
 
-			$response->setHeader('Content-Location', $url . $tag->getId());
+			$response->setHeader('Content-Location', $url.$tag->getId());
 
 			// created
 			$response->setStatus(201);
@@ -179,11 +179,11 @@ 
 		$userAssignable = true;
 
 		if (isset($data['userVisible'])) {
-			$userVisible = (bool)$data['userVisible'];
+			$userVisible = (bool) $data['userVisible'];
 		}
 
 		if (isset($data['userAssignable'])) {
-			$userAssignable = (bool)$data['userAssignable'];
+			$userAssignable = (bool) $data['userAssignable'];
 		}
 
 		$groups = [];
@@ -194,8 +194,8 @@ 
 			}
 		}
 
-		if($userVisible === false || $userAssignable === false || !empty($groups)) {
-			if(!$this->userSession->isLoggedIn() || !$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+		if ($userVisible === false || $userAssignable === false || !empty($groups)) {
+			if (!$this->userSession->isLoggedIn() || !$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
 				throw new BadRequest('Not sufficient permissions');
 			}
 		}

Indentation +276 added lines, -276 removed lines

@@ -46,280 +46,280 @@
  */
 class SystemTagPlugin extends \Sabre\DAV\ServerPlugin {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
-	const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
-	const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
-	const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
-	const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign';
-
-	/**
-	 * @var \Sabre\DAV\Server $server
-	 */
-	private $server;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	protected $tagManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
-
-	/**
-	 * @var IGroupManager
-	 */
-	protected $groupManager;
-
-	/**
-	 * @param ISystemTagManager $tagManager tag manager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(ISystemTagManager $tagManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession) {
-		$this->tagManager = $tagManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$server->protectedProperties[] = self::ID_PROPERTYNAME;
-
-		$server->on('propFind', array($this, 'handleGetProperties'));
-		$server->on('propPatch', array($this, 'handleUpdateProperties'));
-		$server->on('method:POST', [$this, 'httpPost']);
-
-		$this->server = $server;
-	}
-
-	/**
-	 * POST operation on system tag collections
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Making sure the node exists
-		$node = $this->server->tree->getNodeForPath($path);
-		if ($node instanceof SystemTagsByIdCollection || $node instanceof SystemTagsObjectMappingCollection) {
-			$data = $request->getBodyAsString();
-
-			$tag = $this->createTag($data, $request->getHeader('Content-Type'));
-
-			if ($node instanceof SystemTagsObjectMappingCollection) {
-				// also add to collection
-				$node->createFile($tag->getId());
-				$url = $request->getBaseUrl() . 'systemtags/';
-			} else {
-				$url = $request->getUrl();
-			}
-
-			if ($url[strlen($url) - 1] !== '/') {
-				$url .= '/';
-			}
-
-			$response->setHeader('Content-Location', $url . $tag->getId());
-
-			// created
-			$response->setStatus(201);
-			return false;
-		}
-	}
-
-	/**
-	 * Creates a new tag
-	 *
-	 * @param string $data JSON encoded string containing the properties of the tag to create
-	 * @param string $contentType content type of the data
-	 * @return ISystemTag newly created system tag
-	 *
-	 * @throws BadRequest if a field was missing
-	 * @throws Conflict if a tag with the same properties already exists
-	 * @throws UnsupportedMediaType if the content type is not supported
-	 */
-	private function createTag($data, $contentType = 'application/json') {
-		if (explode(';', $contentType)[0] === 'application/json') {
-			$data = json_decode($data, true);
-		} else {
-			throw new UnsupportedMediaType();
-		}
-
-		if (!isset($data['name'])) {
-			throw new BadRequest('Missing "name" attribute');
-		}
-
-		$tagName = $data['name'];
-		$userVisible = true;
-		$userAssignable = true;
-
-		if (isset($data['userVisible'])) {
-			$userVisible = (bool)$data['userVisible'];
-		}
-
-		if (isset($data['userAssignable'])) {
-			$userAssignable = (bool)$data['userAssignable'];
-		}
-
-		$groups = [];
-		if (isset($data['groups'])) {
-			$groups = $data['groups'];
-			if (is_string($groups)) {
-				$groups = explode('|', $groups);
-			}
-		}
-
-		if($userVisible === false || $userAssignable === false || !empty($groups)) {
-			if(!$this->userSession->isLoggedIn() || !$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
-				throw new BadRequest('Not sufficient permissions');
-			}
-		}
-
-		try {
-			$tag = $this->tagManager->createTag($tagName, $userVisible, $userAssignable);
-			if (!empty($groups)) {
-				$this->tagManager->setTagGroups($tag, $groups);
-			}
-			return $tag;
-		} catch (TagAlreadyExistsException $e) {
-			throw new Conflict('Tag already exists', 0, $e);
-		}
-	}
-
-
-	/**
-	 * Retrieves system tag properties
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof SystemTagNode) && !($node instanceof SystemTagMappingNode)) {
-			return;
-		}
-
-		$propFind->handle(self::ID_PROPERTYNAME, function() use ($node) {
-			return $node->getSystemTag()->getId();
-		});
-
-		$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function() use ($node) {
-			return $node->getSystemTag()->getName();
-		});
-
-		$propFind->handle(self::USERVISIBLE_PROPERTYNAME, function() use ($node) {
-			return $node->getSystemTag()->isUserVisible() ? 'true' : 'false';
-		});
-
-		$propFind->handle(self::USERASSIGNABLE_PROPERTYNAME, function() use ($node) {
-			// this is the tag's inherent property "is user assignable"
-			return $node->getSystemTag()->isUserAssignable() ? 'true' : 'false';
-		});
-
-		$propFind->handle(self::CANASSIGN_PROPERTYNAME, function() use ($node) {
-			// this is the effective permission for the current user
-			return $this->tagManager->canUserAssignTag($node->getSystemTag(), $this->userSession->getUser()) ? 'true' : 'false';
-		});
-
-		$propFind->handle(self::GROUPS_PROPERTYNAME, function() use ($node) {
-			if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
-				// property only available for admins
-				throw new Forbidden();
-			}
-			$groups = [];
-			// no need to retrieve groups for namespaces that don't qualify
-			if ($node->getSystemTag()->isUserVisible() && !$node->getSystemTag()->isUserAssignable()) {
-				$groups = $this->tagManager->getTagGroups($node->getSystemTag());
-			}
-			return implode('|', $groups);
-		});
-	}
-
-	/**
-	 * Updates tag attributes
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->server->tree->getNodeForPath($path);
-		if (!($node instanceof SystemTagNode)) {
-			return;
-		}
-
-		$propPatch->handle([
-			self::DISPLAYNAME_PROPERTYNAME,
-			self::USERVISIBLE_PROPERTYNAME,
-			self::USERASSIGNABLE_PROPERTYNAME,
-			self::GROUPS_PROPERTYNAME,
-		], function($props) use ($node) {
-			$tag = $node->getSystemTag();
-			$name = $tag->getName();
-			$userVisible = $tag->isUserVisible();
-			$userAssignable = $tag->isUserAssignable();
-
-			$updateTag = false;
-
-			if (isset($props[self::DISPLAYNAME_PROPERTYNAME])) {
-				$name = $props[self::DISPLAYNAME_PROPERTYNAME];
-				$updateTag = true;
-			}
-
-			if (isset($props[self::USERVISIBLE_PROPERTYNAME])) {
-				$propValue = $props[self::USERVISIBLE_PROPERTYNAME];
-				$userVisible = ($propValue !== 'false' && $propValue !== '0');
-				$updateTag = true;
-			}
-
-			if (isset($props[self::USERASSIGNABLE_PROPERTYNAME])) {
-				$propValue = $props[self::USERASSIGNABLE_PROPERTYNAME];
-				$userAssignable = ($propValue !== 'false' && $propValue !== '0');
-				$updateTag = true;
-			}
-
-			if (isset($props[self::GROUPS_PROPERTYNAME])) {
-				if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
-					// property only available for admins
-					throw new Forbidden();
-				}
-
-				$propValue = $props[self::GROUPS_PROPERTYNAME];
-				$groupIds = explode('|', $propValue);
-				$this->tagManager->setTagGroups($tag, $groupIds);
-			}
-
-			if ($updateTag) {
-				$node->update($name, $userVisible, $userAssignable);
-			}
-
-			return true;
-		});
-
-	}
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+    const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
+    const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
+    const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
+    const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
+    const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign';
+
+    /**
+     * @var \Sabre\DAV\Server $server
+     */
+    private $server;
+
+    /**
+     * @var ISystemTagManager
+     */
+    protected $tagManager;
+
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
+    /**
+     * @var IGroupManager
+     */
+    protected $groupManager;
+
+    /**
+     * @param ISystemTagManager $tagManager tag manager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(ISystemTagManager $tagManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession) {
+        $this->tagManager = $tagManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $server->protectedProperties[] = self::ID_PROPERTYNAME;
+
+        $server->on('propFind', array($this, 'handleGetProperties'));
+        $server->on('propPatch', array($this, 'handleUpdateProperties'));
+        $server->on('method:POST', [$this, 'httpPost']);
+
+        $this->server = $server;
+    }
+
+    /**
+     * POST operation on system tag collections
+     *
+     * @param RequestInterface $request request object
+     * @param ResponseInterface $response response object
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Making sure the node exists
+        $node = $this->server->tree->getNodeForPath($path);
+        if ($node instanceof SystemTagsByIdCollection || $node instanceof SystemTagsObjectMappingCollection) {
+            $data = $request->getBodyAsString();
+
+            $tag = $this->createTag($data, $request->getHeader('Content-Type'));
+
+            if ($node instanceof SystemTagsObjectMappingCollection) {
+                // also add to collection
+                $node->createFile($tag->getId());
+                $url = $request->getBaseUrl() . 'systemtags/';
+            } else {
+                $url = $request->getUrl();
+            }
+
+            if ($url[strlen($url) - 1] !== '/') {
+                $url .= '/';
+            }
+
+            $response->setHeader('Content-Location', $url . $tag->getId());
+
+            // created
+            $response->setStatus(201);
+            return false;
+        }
+    }
+
+    /**
+     * Creates a new tag
+     *
+     * @param string $data JSON encoded string containing the properties of the tag to create
+     * @param string $contentType content type of the data
+     * @return ISystemTag newly created system tag
+     *
+     * @throws BadRequest if a field was missing
+     * @throws Conflict if a tag with the same properties already exists
+     * @throws UnsupportedMediaType if the content type is not supported
+     */
+    private function createTag($data, $contentType = 'application/json') {
+        if (explode(';', $contentType)[0] === 'application/json') {
+            $data = json_decode($data, true);
+        } else {
+            throw new UnsupportedMediaType();
+        }
+
+        if (!isset($data['name'])) {
+            throw new BadRequest('Missing "name" attribute');
+        }
+
+        $tagName = $data['name'];
+        $userVisible = true;
+        $userAssignable = true;
+
+        if (isset($data['userVisible'])) {
+            $userVisible = (bool)$data['userVisible'];
+        }
+
+        if (isset($data['userAssignable'])) {
+            $userAssignable = (bool)$data['userAssignable'];
+        }
+
+        $groups = [];
+        if (isset($data['groups'])) {
+            $groups = $data['groups'];
+            if (is_string($groups)) {
+                $groups = explode('|', $groups);
+            }
+        }
+
+        if($userVisible === false || $userAssignable === false || !empty($groups)) {
+            if(!$this->userSession->isLoggedIn() || !$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+                throw new BadRequest('Not sufficient permissions');
+            }
+        }
+
+        try {
+            $tag = $this->tagManager->createTag($tagName, $userVisible, $userAssignable);
+            if (!empty($groups)) {
+                $this->tagManager->setTagGroups($tag, $groups);
+            }
+            return $tag;
+        } catch (TagAlreadyExistsException $e) {
+            throw new Conflict('Tag already exists', 0, $e);
+        }
+    }
+
+
+    /**
+     * Retrieves system tag properties
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof SystemTagNode) && !($node instanceof SystemTagMappingNode)) {
+            return;
+        }
+
+        $propFind->handle(self::ID_PROPERTYNAME, function() use ($node) {
+            return $node->getSystemTag()->getId();
+        });
+
+        $propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function() use ($node) {
+            return $node->getSystemTag()->getName();
+        });
+
+        $propFind->handle(self::USERVISIBLE_PROPERTYNAME, function() use ($node) {
+            return $node->getSystemTag()->isUserVisible() ? 'true' : 'false';
+        });
+
+        $propFind->handle(self::USERASSIGNABLE_PROPERTYNAME, function() use ($node) {
+            // this is the tag's inherent property "is user assignable"
+            return $node->getSystemTag()->isUserAssignable() ? 'true' : 'false';
+        });
+
+        $propFind->handle(self::CANASSIGN_PROPERTYNAME, function() use ($node) {
+            // this is the effective permission for the current user
+            return $this->tagManager->canUserAssignTag($node->getSystemTag(), $this->userSession->getUser()) ? 'true' : 'false';
+        });
+
+        $propFind->handle(self::GROUPS_PROPERTYNAME, function() use ($node) {
+            if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+                // property only available for admins
+                throw new Forbidden();
+            }
+            $groups = [];
+            // no need to retrieve groups for namespaces that don't qualify
+            if ($node->getSystemTag()->isUserVisible() && !$node->getSystemTag()->isUserAssignable()) {
+                $groups = $this->tagManager->getTagGroups($node->getSystemTag());
+            }
+            return implode('|', $groups);
+        });
+    }
+
+    /**
+     * Updates tag attributes
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->server->tree->getNodeForPath($path);
+        if (!($node instanceof SystemTagNode)) {
+            return;
+        }
+
+        $propPatch->handle([
+            self::DISPLAYNAME_PROPERTYNAME,
+            self::USERVISIBLE_PROPERTYNAME,
+            self::USERASSIGNABLE_PROPERTYNAME,
+            self::GROUPS_PROPERTYNAME,
+        ], function($props) use ($node) {
+            $tag = $node->getSystemTag();
+            $name = $tag->getName();
+            $userVisible = $tag->isUserVisible();
+            $userAssignable = $tag->isUserAssignable();
+
+            $updateTag = false;
+
+            if (isset($props[self::DISPLAYNAME_PROPERTYNAME])) {
+                $name = $props[self::DISPLAYNAME_PROPERTYNAME];
+                $updateTag = true;
+            }
+
+            if (isset($props[self::USERVISIBLE_PROPERTYNAME])) {
+                $propValue = $props[self::USERVISIBLE_PROPERTYNAME];
+                $userVisible = ($propValue !== 'false' && $propValue !== '0');
+                $updateTag = true;
+            }
+
+            if (isset($props[self::USERASSIGNABLE_PROPERTYNAME])) {
+                $propValue = $props[self::USERASSIGNABLE_PROPERTYNAME];
+                $userAssignable = ($propValue !== 'false' && $propValue !== '0');
+                $updateTag = true;
+            }
+
+            if (isset($props[self::GROUPS_PROPERTYNAME])) {
+                if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+                    // property only available for admins
+                    throw new Forbidden();
+                }
+
+                $propValue = $props[self::GROUPS_PROPERTYNAME];
+                $groupIds = explode('|', $propValue);
+                $this->tagManager->setTagGroups($tag, $groupIds);
+            }
+
+            if ($updateTag) {
+                $node->update($name, $userVisible, $userAssignable);
+            }
+
+            return true;
+        });
+
+    }
 }

apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php

Indentation +49 added lines, -49 removed lines

@@ -36,59 +36,59 @@
 
 class SystemTagsRelationsCollection extends SimpleCollection {
 
-	/**
-	 * SystemTagsRelationsCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		EventDispatcherInterface $dispatcher
-	) {
-		$children = [
-			new SystemTagsObjectTypeCollection(
-				'files',
-				$tagManager,
-				$tagMapper,
-				$userSession,
-				$groupManager,
-				function($name) {
-					$nodes = \OC::$server->getUserFolder()->getById(intval($name));
-					return !empty($nodes);
-				}
-			),
-		];
+    /**
+     * SystemTagsRelationsCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $children = [
+            new SystemTagsObjectTypeCollection(
+                'files',
+                $tagManager,
+                $tagMapper,
+                $userSession,
+                $groupManager,
+                function($name) {
+                    $nodes = \OC::$server->getUserFolder()->getById(intval($name));
+                    return !empty($nodes);
+                }
+            ),
+        ];
 
-		$event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY);
-		$dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event);
+        $event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY);
+        $dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event);
 
-		foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
-			$children[] = new SystemTagsObjectTypeCollection(
-				$entity,
-				$tagManager,
-				$tagMapper,
-				$userSession,
-				$groupManager,
-				$entityExistsFunction
-			);
-		}
+        foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
+            $children[] = new SystemTagsObjectTypeCollection(
+                $entity,
+                $tagManager,
+                $tagMapper,
+                $userSession,
+                $groupManager,
+                $entityExistsFunction
+            );
+        }
 
-		parent::__construct('root', $children);
-	}
+        parent::__construct('root', $children);
+    }
 
-	function getName() {
-		return 'systemtags-relations';
-	}
+    function getName() {
+        return 'systemtags-relations';
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
 
 }

apps/dav/bin/chunkperf.php

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
+	echo "Invalid number of arguments".PHP_EOL;
 	exit;
 }
 
@@ -37,9 +37,9 @@ 
 	$t0 = microtime(true);
 	$result = $client->request($method, $uploadUrl, $data, $headers);
 	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
+	echo $result['statusCode']." - ".($t1 - $t0).' seconds'.PHP_EOL;
+	if (!in_array($result['statusCode'], [200, 201])) {
+		echo $result['body'].PHP_EOL;
 	}
 	return $result;
 }
@@ -65,7 +65,7 @@ 
 $stream = fopen($file, 'r');
 
 $index = 0;
-while(!feof($stream)) {
+while (!feof($stream)) {
 	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
 	$index++;
 }

Indentation +19 added lines, -19 removed lines

@@ -23,8 +23,8 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
-	exit;
+    echo "Invalid number of arguments" . PHP_EOL;
+    exit;
 }
 
 /**
@@ -33,15 +33,15 @@ 
  * @return mixed
  */
 function request($client, $method, $uploadUrl, $data = null, $headers = []) {
-	echo "$method $uploadUrl ... ";
-	$t0 = microtime(true);
-	$result = $client->request($method, $uploadUrl, $data, $headers);
-	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
-	}
-	return $result;
+    echo "$method $uploadUrl ... ";
+    $t0 = microtime(true);
+    $result = $client->request($method, $uploadUrl, $data, $headers);
+    $t1 = microtime(true);
+    echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
+    if (!in_array($result['statusCode'],  [200, 201])) {
+        echo $result['body'] . PHP_EOL;
+    }
+    return $result;
 }
 
 $baseUri = $argv[1];
@@ -51,9 +51,9 @@ 
 $chunkSize = $argv[5] * 1024 * 1024;
 
 $client = new \Sabre\DAV\Client([
-	'baseUri' => $baseUri,
-	'userName' => $userName,
-	'password' => $password
+    'baseUri' => $baseUri,
+    'userName' => $userName,
+    'password' => $password
 ]);
 
 $transfer = uniqid('transfer', true);
@@ -66,14 +66,14 @@ 
 
 $index = 0;
 while(!feof($stream)) {
-	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
-	$index++;
+    request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
+    $index++;
 }
 
 $destination = pathinfo($file, PATHINFO_BASENAME);
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
 request($client, 'MOVE', "$uploadUrl/.file", null, [
-	'Destination' => "$baseUri/files/$userName/$destination",
-	'OC-Total-Length' => filesize($file),
-	'X-OC-MTime' => filemtime($file)
+    'Destination' => "$baseUri/files/$userName/$destination",
+    'OC-Total-Length' => filesize($file),
+    'X-OC-MTime' => filemtime($file)
 ]);

apps/files_versions/ajax/getVersions.php

Indentation +11 added lines, -11 removed lines

@@ -35,22 +35,22 @@
 $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source);
 if( $versions ) {
 
-	$endReached = false;
-	if (count($versions) <= $start+$count) {
-		$endReached = true;
-	}
+    $endReached = false;
+    if (count($versions) <= $start+$count) {
+        $endReached = true;
+    }
 
-	$versions = array_slice($versions, $start, $count);
+    $versions = array_slice($versions, $start, $count);
 
-	// remove owner path from request to not disclose it to the recipient
-	foreach ($versions as $version) {
-		unset($version['path']);
-	}
+    // remove owner path from request to not disclose it to the recipient
+    foreach ($versions as $version) {
+        unset($version['path']);
+    }
 
-	\OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
+    \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
 
 } else {
 
-	\OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
+    \OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
 
 }

Spacing +4 added lines, -4 removed lines

@@ -28,15 +28,15 @@
 OCP\JSON::callCheck();
 OCP\JSON::checkAppEnabled('files_versions');
 
-$source = (string)$_GET['source'];
-$start = (int)$_GET['start'];
+$source = (string) $_GET['source'];
+$start = (int) $_GET['start'];
 list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source);
 $count = 5; //show the newest revisions
 $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source);
-if( $versions ) {
+if ($versions) {
 
 	$endReached = false;
-	if (count($versions) <= $start+$count) {
+	if (count($versions) <= $start + $count) {
 		$endReached = true;
 	}
 

apps/files_versions/ajax/rollbackVersion.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
 $revision=(int)$_GET['revision'];
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
+    OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
 }else{
-	$l = \OC::$server->getL10N('files_versions');
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
+    $l = \OC::$server->getL10N('files_versions');
+    OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

Spacing +6 added lines, -6 removed lines

@@ -30,12 +30,12 @@
 OCP\JSON::checkAppEnabled('files_versions');
 OCP\JSON::callCheck();
 
-$file = (string)$_GET['file'];
-$revision=(int)$_GET['revision'];
+$file = (string) $_GET['file'];
+$revision = (int) $_GET['revision'];
 
-if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
-}else{
+if (OCA\Files_Versions\Storage::rollback($file, $revision)) {
+	OCP\JSON::success(array("data" => array("revision" => $revision, "file" => $file)));
+} else {
 	$l = \OC::$server->getL10N('files_versions');
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
+	OCP\JSON::error(array("data" => array("message" => $l->t("Could not revert: %s", array($file)))));
 }

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
 	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
-}else{
+} else{
 	$l = \OC::$server->getL10N('files_versions');
 	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

apps/files_versions/lib/Controller/PreviewController.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 		$y = 44,
 		$version = ''
 	) {
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
+		if ($file === '' || $version === '' || $x === 0 || $y === 0) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 

Indentation +54 added lines, -54 removed lines

@@ -36,66 +36,66 @@
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								$userId,
-								IMimeTypeDetector $mimeTypeDetector,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    public function __construct($appName,
+                                IRequest $request,
+                                IRootFolder $rootFolder,
+                                $userId,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userId = $userId;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param string $version
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44,
-		$version = ''
-	) {
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param string $version
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44,
+        $version = ''
+    ) {
+        if($file === '' || $version === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var Folder $versionFolder */
-			$versionFolder = $userFolder->getParent()->get('files_versions');
-			$mimeType = $this->mimeTypeDetector->detectPath($file);
-			$file = $versionFolder->get($file.'.v'.$version);
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var Folder $versionFolder */
+            $versionFolder = $userFolder->getParent()->get('files_versions');
+            $mimeType = $this->mimeTypeDetector->detectPath($file);
+            $file = $versionFolder->get($file.'.v'.$version);
 
-			/** @var File $file */
-			$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            /** @var File $file */
+            $f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }