nextcloud / server

apps/dav/lib/CalDAV/PublicCalendarObject.php

Indentation +7 added lines, -7 removed lines

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

apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
 
 class SearchTermFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}search-term has illegal value');
 		}
 
 		return $value;

apps/dav/lib/SystemTag/SystemTagsByIdCollection.php

Indentation +140 added lines, -140 removed lines

@@ -35,144 +35,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
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create tags by id');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public 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);
-		}
-	}
-
-	public 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
-	 */
-	public 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;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	public function getName() {
-		return 'systemtags';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public 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
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create tags by id');
+    }
+
+    /**
+     * @param string $name
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $name
+     */
+    public 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);
+        }
+    }
+
+    public 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
+     */
+    public 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;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    public function getName() {
+        return 'systemtags';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public 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 +3 added lines, -3 removed lines

@@ -104,13 +104,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);
 		}
 	}
 
@@ -121,7 +121,7 @@ 
 		}
 
 		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function ($tag) {
+		return array_map(function($tag) {
 			return $this->makeNode($tag);
 		}, $tags);
 	}

apps/dav/lib/SystemTag/SystemTagPlugin.php

Spacing +11 added lines, -11 removed lines

@@ -133,7 +133,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();
 			}
@@ -142,7 +142,7 @@ 
 				$url .= '/';
 			}
 
-			$response->setHeader('Content-Location', $url . $tag->getId());
+			$response->setHeader('Content-Location', $url.$tag->getId());
 
 			// created
 			$response->setStatus(201);
@@ -177,11 +177,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 = [];
@@ -224,29 +224,29 @@ 
 			return;
 		}
 
-		$propFind->handle(self::ID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(self::ID_PROPERTYNAME, function() use ($node) {
 			return $node->getSystemTag()->getId();
 		});
 
-		$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function() use ($node) {
 			return $node->getSystemTag()->getName();
 		});
 
-		$propFind->handle(self::USERVISIBLE_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(self::USERVISIBLE_PROPERTYNAME, function() use ($node) {
 			return $node->getSystemTag()->isUserVisible() ? 'true' : 'false';
 		});
 
-		$propFind->handle(self::USERASSIGNABLE_PROPERTYNAME, function () use ($node) {
+		$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) {
+		$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) {
+		$propFind->handle(self::GROUPS_PROPERTYNAME, function() use ($node) {
 			if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
 				// property only available for admins
 				throw new Forbidden();
@@ -279,7 +279,7 @@ 
 			self::USERVISIBLE_PROPERTYNAME,
 			self::USERASSIGNABLE_PROPERTYNAME,
 			self::GROUPS_PROPERTYNAME,
-		], function ($props) use ($node) {
+		], function($props) use ($node) {
 			$tag = $node->getSystemTag();
 			$name = $tag->getName();
 			$userVisible = $tag->isUserVisible();

Indentation +274 added lines, -274 removed lines

@@ -49,278 +49,278 @@
  */
 class SystemTagPlugin extends \Sabre\DAV\ServerPlugin {
 
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	public const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
-	public const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
-	public const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
-	public const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
-	public 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', [$this, 'handleGetProperties']);
-		$server->on('propPatch', [$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
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+    public const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
+    public const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
+    public const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
+    public const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
+    public 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', [$this, 'handleGetProperties']);
+        $server->on('propPatch', [$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/Upload/UploadFolder.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	}
 
 	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	public function getChild($name) {

Indentation +64 added lines, -64 removed lines

@@ -30,68 +30,68 @@
 
 class UploadFolder implements ICollection {
 
-	/** @var Directory */
-	private $node;
-	/** @var CleanupService */
-	private $cleanupService;
-
-	public function __construct(Directory $node, CleanupService $cleanupService) {
-		$this->node = $node;
-		$this->cleanupService = $cleanupService;
-	}
-
-	public function createFile($name, $data = null) {
-		// TODO: verify name - should be a simple number
-		$this->node->createFile($name, $data);
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
-
-	public function getChild($name) {
-		if ($name === '.file') {
-			return new FutureFile($this->node, '.file');
-		}
-		return new UploadFile($this->node->getChild($name));
-	}
-
-	public function getChildren() {
-		$tmpChildren = $this->node->getChildren();
-
-		$children = [];
-		$children[] = new FutureFile($this->node, '.file');
-
-		foreach ($tmpChildren as $child) {
-			$children[] = new UploadFile($child);
-		}
-
-		return $children;
-	}
-
-	public function childExists($name) {
-		if ($name === '.file') {
-			return true;
-		}
-		return $this->node->childExists($name);
-	}
-
-	public function delete() {
-		$this->node->delete();
-
-		// Background cleanup job is not needed anymore
-		$this->cleanupService->removeJob($this->getName());
-	}
-
-	public function getName() {
-		return $this->node->getName();
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
-
-	public function getLastModified() {
-		return $this->node->getLastModified();
-	}
+    /** @var Directory */
+    private $node;
+    /** @var CleanupService */
+    private $cleanupService;
+
+    public function __construct(Directory $node, CleanupService $cleanupService) {
+        $this->node = $node;
+        $this->cleanupService = $cleanupService;
+    }
+
+    public function createFile($name, $data = null) {
+        // TODO: verify name - should be a simple number
+        $this->node->createFile($name, $data);
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
+
+    public function getChild($name) {
+        if ($name === '.file') {
+            return new FutureFile($this->node, '.file');
+        }
+        return new UploadFile($this->node->getChild($name));
+    }
+
+    public function getChildren() {
+        $tmpChildren = $this->node->getChildren();
+
+        $children = [];
+        $children[] = new FutureFile($this->node, '.file');
+
+        foreach ($tmpChildren as $child) {
+            $children[] = new UploadFile($child);
+        }
+
+        return $children;
+    }
+
+    public function childExists($name) {
+        if ($name === '.file') {
+            return true;
+        }
+        return $this->node->childExists($name);
+    }
+
+    public function delete() {
+        $this->node->delete();
+
+        // Background cleanup job is not needed anymore
+        $this->cleanupService->removeJob($this->getName());
+    }
+
+    public function getName() {
+        return $this->node->getName();
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
+
+    public function getLastModified() {
+        return $this->node->getLastModified();
+    }
 }

apps/dav/lib/Upload/FutureFile.php

Indentation +72 added lines, -72 removed lines

@@ -36,87 +36,87 @@
  */
 class FutureFile implements \Sabre\DAV\IFile {
 
-	/** @var Directory */
-	private $root;
-	/** @var string */
-	private $name;
+    /** @var Directory */
+    private $root;
+    /** @var string */
+    private $name;
 
-	/**
-	 * @param Directory $root
-	 * @param string $name
-	 */
-	public function __construct(Directory $root, $name) {
-		$this->root = $root;
-		$this->name = $name;
-	}
+    /**
+     * @param Directory $root
+     * @param string $name
+     */
+    public function __construct(Directory $root, $name) {
+        $this->root = $root;
+        $this->name = $name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		$nodes = $this->root->getChildren();
-		return AssemblyStream::wrap($nodes);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        $nodes = $this->root->getChildren();
+        return AssemblyStream::wrap($nodes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getETag() {
-		return $this->root->getETag();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getETag() {
+        return $this->root->getETag();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getSize() {
-		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
-			/** @var IFile $node */
-			return $node->getSize();
-		}, $children);
+    /**
+     * @inheritdoc
+     */
+    public function getSize() {
+        $children = $this->root->getChildren();
+        $sizes = array_map(function ($node) {
+            /** @var IFile $node */
+            return $node->getSize();
+        }, $children);
 
-		return array_sum($sizes);
-	}
+        return array_sum($sizes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getLastModified() {
-		return $this->root->getLastModified();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getLastModified() {
+        return $this->root->getLastModified();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	public function getSize() {
 		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
+		$sizes = array_map(function($node) {
 			/** @var IFile $node */
 			return $node->getSize();
 		}, $children);

apps/dav/appinfo/v1/webdav.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function () {
+$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function() {
 	// use the view for the logged in user
 	return \OC\Files\Filesystem::getView();
 });

Indentation +22 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
 
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 
@@ -40,40 +40,40 @@ 
 \OC_Util::obEnd();
 
 $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->get(LoggerInterface::class),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager(),
-	\OC::$server->getEventDispatcher(),
-	\OC::$server->getL10N('dav')
+    \OC::$server->getConfig(),
+    \OC::$server->get(LoggerInterface::class),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager(),
+    \OC::$server->getEventDispatcher(),
+    \OC::$server->getL10N('dav')
 );
 
 // Backends
 $authBackend = new \OCA\DAV\Connector\Sabre\Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new \OCA\DAV\Connector\Sabre\BearerAuth(
-	\OC::$server->getUserSession(),
-	\OC::$server->getSession(),
-	\OC::$server->getRequest()
+    \OC::$server->getUserSession(),
+    \OC::$server->getSession(),
+    \OC::$server->getRequest()
 );
 $authPlugin->addBackend($bearerAuthPlugin);
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function () {
-	// use the view for the logged in user
-	return \OC\Files\Filesystem::getView();
+    // use the view for the logged in user
+    return \OC\Files\Filesystem::getView();
 });
 
 $dispatcher = \OC::$server->getEventDispatcher();

apps/files_sharing/lib/DeleteOrphanedSharesJob.php

Indentation +27 added lines, -27 removed lines

@@ -31,35 +31,35 @@
  */
 class DeleteOrphanedSharesJob extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 15;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 15;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$logger = \OC::$server->getLogger();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $logger = \OC::$server->getLogger();
 
-		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
-			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
+        $sql =
+            'DELETE FROM `*PREFIX*share` ' .
+            'WHERE `item_type` in (\'file\', \'folder\') ' .
+            'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
-		$deletedEntries = $connection->executeUpdate($sql);
-		$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
-	}
+        $deletedEntries = $connection->executeUpdate($sql);
+        $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
 		$logger = \OC::$server->getLogger();
 
 		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
+			'DELETE FROM `*PREFIX*share` '.
+			'WHERE `item_type` in (\'file\', \'folder\') '.
 			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
 		$deletedEntries = $connection->executeUpdate($sql);

apps/files_external/lib/Lib/StorageConfig.php

Spacing +2 added lines, -2 removed lines

@@ -220,7 +220,7 @@ 
 				if (isset($parameters[$key])) {
 					switch ($parameters[$key]->getType()) {
 						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
+							$value = (bool) $value;
 							break;
 					}
 					$backendOptions[$key] = $value;
@@ -426,7 +426,7 @@ 
 			$result['statusMessage'] = $this->statusMessage;
 		}
 		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal' : 'system';
 		return $result;
 	}
 }

Indentation +392 added lines, -392 removed lines

@@ -36,396 +36,396 @@
  * External storage configuration
  */
 class StorageConfig implements \JsonSerializable {
-	public const MOUNT_TYPE_ADMIN = 1;
-	public const MOUNT_TYPE_PERSONAl = 2;
-
-	/**
-	 * Storage config id
-	 *
-	 * @var int
-	 */
-	private $id;
-
-	/**
-	 * Backend
-	 *
-	 * @var Backend
-	 */
-	private $backend;
-
-	/**
-	 * Authentication mechanism
-	 *
-	 * @var AuthMechanism
-	 */
-	private $authMechanism;
-
-	/**
-	 * Backend options
-	 *
-	 * @var array
-	 */
-	private $backendOptions = [];
-
-	/**
-	 * Mount point path, relative to the user's "files" folder
-	 *
-	 * @var string
-	 */
-	private $mountPoint;
-
-	/**
-	 * Storage status
-	 *
-	 * @var int
-	 */
-	private $status;
-
-	/**
-	 * Status message
-	 *
-	 * @var string
-	 */
-	private $statusMessage;
-
-	/**
-	 * Priority
-	 *
-	 * @var int
-	 */
-	private $priority;
-
-	/**
-	 * List of users who have access to this storage
-	 *
-	 * @var string[]
-	 */
-	private $applicableUsers = [];
-
-	/**
-	 * List of groups that have access to this storage
-	 *
-	 * @var string[]
-	 */
-	private $applicableGroups = [];
-
-	/**
-	 * Mount-specific options
-	 *
-	 * @var array
-	 */
-	private $mountOptions = [];
-
-	/**
-	 * Whether it's a personal or admin mount
-	 *
-	 * @var int
-	 */
-	private $type;
-
-	/**
-	 * Creates a storage config
-	 *
-	 * @param int|string $id config id or null for a new config
-	 */
-	public function __construct($id = null) {
-		$this->id = $id ?? -1;
-		$this->mountOptions['enable_sharing'] = false;
-	}
-
-	/**
-	 * Returns the configuration id
-	 *
-	 * @retun int
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Sets the configuration id
-	 *
-	 * @param int $id configuration id
-	 */
-	public function setId(int $id): void {
-		$this->id = $id;
-	}
-
-	/**
-	 * Returns mount point path relative to the user's
-	 * "files" folder.
-	 *
-	 * @return string path
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
-
-	/**
-	 * Sets mount point path relative to the user's
-	 * "files" folder.
-	 * The path will be normalized.
-	 *
-	 * @param string $mountPoint path
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
-	}
-
-	/**
-	 * @return Backend
-	 */
-	public function getBackend() {
-		return $this->backend;
-	}
-
-	/**
-	 * @param Backend $backend
-	 */
-	public function setBackend(Backend $backend) {
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @return AuthMechanism
-	 */
-	public function getAuthMechanism() {
-		return $this->authMechanism;
-	}
-
-	/**
-	 * @param AuthMechanism $authMechanism
-	 */
-	public function setAuthMechanism(AuthMechanism $authMechanism) {
-		$this->authMechanism = $authMechanism;
-	}
-
-	/**
-	 * Returns the external storage backend-specific options
-	 *
-	 * @return array backend options
-	 */
-	public function getBackendOptions() {
-		return $this->backendOptions;
-	}
-
-	/**
-	 * Sets the external storage backend-specific options
-	 *
-	 * @param array $backendOptions backend options
-	 */
-	public function setBackendOptions($backendOptions) {
-		if ($this->getBackend() instanceof  Backend) {
-			$parameters = $this->getBackend()->getParameters();
-			foreach ($backendOptions as $key => $value) {
-				if (isset($parameters[$key])) {
-					switch ($parameters[$key]->getType()) {
-						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
-							break;
-					}
-					$backendOptions[$key] = $value;
-				}
-			}
-		}
-
-		$this->backendOptions = $backendOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getBackendOption($key) {
-		if (isset($this->backendOptions[$key])) {
-			return $this->backendOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setBackendOption($key, $value) {
-		$this->backendOptions[$key] = $value;
-	}
-
-	/**
-	 * Returns the mount priority
-	 *
-	 * @return int priority
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
-
-	/**
-	 * Sets the mount priority
-	 *
-	 * @param int $priority priority
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-	}
-
-	/**
-	 * Returns the users for which to mount this storage
-	 *
-	 * @return string[] applicable users
-	 */
-	public function getApplicableUsers() {
-		return $this->applicableUsers;
-	}
-
-	/**
-	 * Sets the users for which to mount this storage
-	 *
-	 * @param string[]|null $applicableUsers applicable users
-	 */
-	public function setApplicableUsers($applicableUsers) {
-		if (is_null($applicableUsers)) {
-			$applicableUsers = [];
-		}
-		$this->applicableUsers = $applicableUsers;
-	}
-
-	/**
-	 * Returns the groups for which to mount this storage
-	 *
-	 * @return string[] applicable groups
-	 */
-	public function getApplicableGroups() {
-		return $this->applicableGroups;
-	}
-
-	/**
-	 * Sets the groups for which to mount this storage
-	 *
-	 * @param string[]|null $applicableGroups applicable groups
-	 */
-	public function setApplicableGroups($applicableGroups) {
-		if (is_null($applicableGroups)) {
-			$applicableGroups = [];
-		}
-		$this->applicableGroups = $applicableGroups;
-	}
-
-	/**
-	 * Returns the mount-specific options
-	 *
-	 * @return array mount specific options
-	 */
-	public function getMountOptions() {
-		return $this->mountOptions;
-	}
-
-	/**
-	 * Sets the mount-specific options
-	 *
-	 * @param array $mountOptions applicable groups
-	 */
-	public function setMountOptions($mountOptions) {
-		if (is_null($mountOptions)) {
-			$mountOptions = [];
-		}
-		$this->mountOptions = $mountOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getMountOption($key) {
-		if (isset($this->mountOptions[$key])) {
-			return $this->mountOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setMountOption($key, $value) {
-		$this->mountOptions[$key] = $value;
-	}
-
-	/**
-	 * Gets the storage status, whether the config worked last time
-	 *
-	 * @return int $status status
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-	/**
-	 * Gets the message describing the storage status
-	 *
-	 * @return string|null
-	 */
-	public function getStatusMessage() {
-		return $this->statusMessage;
-	}
-
-	/**
-	 * Sets the storage status, whether the config worked last time
-	 *
-	 * @param int $status status
-	 * @param string|null $message optional message
-	 */
-	public function setStatus($status, $message = null) {
-		$this->status = $status;
-		$this->statusMessage = $message;
-	}
-
-	/**
-	 * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function setType($type) {
-		$this->type = $type;
-	}
-
-	/**
-	 * Serialize config to JSON
-	 */
-	public function jsonSerialize(): array {
-		$result = [];
-		if (!is_null($this->id)) {
-			$result['id'] = $this->id;
-		}
-		$result['mountPoint'] = $this->mountPoint;
-		$result['backend'] = $this->backend->getIdentifier();
-		$result['authMechanism'] = $this->authMechanism->getIdentifier();
-		$result['backendOptions'] = $this->backendOptions;
-		if (!is_null($this->priority)) {
-			$result['priority'] = $this->priority;
-		}
-		if (!empty($this->applicableUsers)) {
-			$result['applicableUsers'] = $this->applicableUsers;
-		}
-		if (!empty($this->applicableGroups)) {
-			$result['applicableGroups'] = $this->applicableGroups;
-		}
-		if (!empty($this->mountOptions)) {
-			$result['mountOptions'] = $this->mountOptions;
-		}
-		if (!is_null($this->status)) {
-			$result['status'] = $this->status;
-		}
-		if (!is_null($this->statusMessage)) {
-			$result['statusMessage'] = $this->statusMessage;
-		}
-		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
-		return $result;
-	}
+    public const MOUNT_TYPE_ADMIN = 1;
+    public const MOUNT_TYPE_PERSONAl = 2;
+
+    /**
+     * Storage config id
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * Backend
+     *
+     * @var Backend
+     */
+    private $backend;
+
+    /**
+     * Authentication mechanism
+     *
+     * @var AuthMechanism
+     */
+    private $authMechanism;
+
+    /**
+     * Backend options
+     *
+     * @var array
+     */
+    private $backendOptions = [];
+
+    /**
+     * Mount point path, relative to the user's "files" folder
+     *
+     * @var string
+     */
+    private $mountPoint;
+
+    /**
+     * Storage status
+     *
+     * @var int
+     */
+    private $status;
+
+    /**
+     * Status message
+     *
+     * @var string
+     */
+    private $statusMessage;
+
+    /**
+     * Priority
+     *
+     * @var int
+     */
+    private $priority;
+
+    /**
+     * List of users who have access to this storage
+     *
+     * @var string[]
+     */
+    private $applicableUsers = [];
+
+    /**
+     * List of groups that have access to this storage
+     *
+     * @var string[]
+     */
+    private $applicableGroups = [];
+
+    /**
+     * Mount-specific options
+     *
+     * @var array
+     */
+    private $mountOptions = [];
+
+    /**
+     * Whether it's a personal or admin mount
+     *
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Creates a storage config
+     *
+     * @param int|string $id config id or null for a new config
+     */
+    public function __construct($id = null) {
+        $this->id = $id ?? -1;
+        $this->mountOptions['enable_sharing'] = false;
+    }
+
+    /**
+     * Returns the configuration id
+     *
+     * @retun int
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Sets the configuration id
+     *
+     * @param int $id configuration id
+     */
+    public function setId(int $id): void {
+        $this->id = $id;
+    }
+
+    /**
+     * Returns mount point path relative to the user's
+     * "files" folder.
+     *
+     * @return string path
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
+
+    /**
+     * Sets mount point path relative to the user's
+     * "files" folder.
+     * The path will be normalized.
+     *
+     * @param string $mountPoint path
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
+    }
+
+    /**
+     * @return Backend
+     */
+    public function getBackend() {
+        return $this->backend;
+    }
+
+    /**
+     * @param Backend $backend
+     */
+    public function setBackend(Backend $backend) {
+        $this->backend = $backend;
+    }
+
+    /**
+     * @return AuthMechanism
+     */
+    public function getAuthMechanism() {
+        return $this->authMechanism;
+    }
+
+    /**
+     * @param AuthMechanism $authMechanism
+     */
+    public function setAuthMechanism(AuthMechanism $authMechanism) {
+        $this->authMechanism = $authMechanism;
+    }
+
+    /**
+     * Returns the external storage backend-specific options
+     *
+     * @return array backend options
+     */
+    public function getBackendOptions() {
+        return $this->backendOptions;
+    }
+
+    /**
+     * Sets the external storage backend-specific options
+     *
+     * @param array $backendOptions backend options
+     */
+    public function setBackendOptions($backendOptions) {
+        if ($this->getBackend() instanceof  Backend) {
+            $parameters = $this->getBackend()->getParameters();
+            foreach ($backendOptions as $key => $value) {
+                if (isset($parameters[$key])) {
+                    switch ($parameters[$key]->getType()) {
+                        case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
+                            $value = (bool)$value;
+                            break;
+                    }
+                    $backendOptions[$key] = $value;
+                }
+            }
+        }
+
+        $this->backendOptions = $backendOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getBackendOption($key) {
+        if (isset($this->backendOptions[$key])) {
+            return $this->backendOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setBackendOption($key, $value) {
+        $this->backendOptions[$key] = $value;
+    }
+
+    /**
+     * Returns the mount priority
+     *
+     * @return int priority
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
+
+    /**
+     * Sets the mount priority
+     *
+     * @param int $priority priority
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+    }
+
+    /**
+     * Returns the users for which to mount this storage
+     *
+     * @return string[] applicable users
+     */
+    public function getApplicableUsers() {
+        return $this->applicableUsers;
+    }
+
+    /**
+     * Sets the users for which to mount this storage
+     *
+     * @param string[]|null $applicableUsers applicable users
+     */
+    public function setApplicableUsers($applicableUsers) {
+        if (is_null($applicableUsers)) {
+            $applicableUsers = [];
+        }
+        $this->applicableUsers = $applicableUsers;
+    }
+
+    /**
+     * Returns the groups for which to mount this storage
+     *
+     * @return string[] applicable groups
+     */
+    public function getApplicableGroups() {
+        return $this->applicableGroups;
+    }
+
+    /**
+     * Sets the groups for which to mount this storage
+     *
+     * @param string[]|null $applicableGroups applicable groups
+     */
+    public function setApplicableGroups($applicableGroups) {
+        if (is_null($applicableGroups)) {
+            $applicableGroups = [];
+        }
+        $this->applicableGroups = $applicableGroups;
+    }
+
+    /**
+     * Returns the mount-specific options
+     *
+     * @return array mount specific options
+     */
+    public function getMountOptions() {
+        return $this->mountOptions;
+    }
+
+    /**
+     * Sets the mount-specific options
+     *
+     * @param array $mountOptions applicable groups
+     */
+    public function setMountOptions($mountOptions) {
+        if (is_null($mountOptions)) {
+            $mountOptions = [];
+        }
+        $this->mountOptions = $mountOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getMountOption($key) {
+        if (isset($this->mountOptions[$key])) {
+            return $this->mountOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setMountOption($key, $value) {
+        $this->mountOptions[$key] = $value;
+    }
+
+    /**
+     * Gets the storage status, whether the config worked last time
+     *
+     * @return int $status status
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+    /**
+     * Gets the message describing the storage status
+     *
+     * @return string|null
+     */
+    public function getStatusMessage() {
+        return $this->statusMessage;
+    }
+
+    /**
+     * Sets the storage status, whether the config worked last time
+     *
+     * @param int $status status
+     * @param string|null $message optional message
+     */
+    public function setStatus($status, $message = null) {
+        $this->status = $status;
+        $this->statusMessage = $message;
+    }
+
+    /**
+     * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function getType() {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function setType($type) {
+        $this->type = $type;
+    }
+
+    /**
+     * Serialize config to JSON
+     */
+    public function jsonSerialize(): array {
+        $result = [];
+        if (!is_null($this->id)) {
+            $result['id'] = $this->id;
+        }
+        $result['mountPoint'] = $this->mountPoint;
+        $result['backend'] = $this->backend->getIdentifier();
+        $result['authMechanism'] = $this->authMechanism->getIdentifier();
+        $result['backendOptions'] = $this->backendOptions;
+        if (!is_null($this->priority)) {
+            $result['priority'] = $this->priority;
+        }
+        if (!empty($this->applicableUsers)) {
+            $result['applicableUsers'] = $this->applicableUsers;
+        }
+        if (!empty($this->applicableGroups)) {
+            $result['applicableGroups'] = $this->applicableGroups;
+        }
+        if (!empty($this->mountOptions)) {
+            $result['mountOptions'] = $this->mountOptions;
+        }
+        if (!is_null($this->status)) {
+            $result['status'] = $this->status;
+        }
+        if (!is_null($this->statusMessage)) {
+            $result['statusMessage'] = $this->statusMessage;
+        }
+        $result['userProvided'] = $this->authMechanism instanceof IUserProvided;
+        $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+        return $result;
+    }
 }