nextcloud / server

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/Capabilities.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
 use OCP\Capabilities\ICapability;
 
 class Capabilities implements ICapability {
-	public function getCapabilities() {
-		return [
-			'dav' => [
-				'chunking' => '1.0',
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'dav' => [
+                'chunking' => '1.0',
+            ]
+        ];
+    }
 }

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

@@ -30,7 +30,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);
 
@@ -38,40 +38,40 @@ 
 \OC_Util::obEnd();
 
 $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\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->getLogger(),
+    \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/External/Scanner.php

Spacing +6 added lines, -6 removed lines

@@ -88,8 +88,8 @@ 
 		} catch (\Exception $e) {
 			$this->storage->checkStorageAvailability();
 			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
+				'Error while scanning remote share: "'.
+				$this->storage->getRemote().'" '.
 				$e->getMessage()
 			);
 		}
@@ -97,8 +97,8 @@ 
 			$this->addResult($data['data'], '');
 		} else {
 			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
+				'Error while scanning remote share: "'.
+				$this->storage->getRemote().'"'
 			);
 		}
 	}
@@ -113,14 +113,14 @@ 
 			$children = [];
 			foreach ($data['children'] as $child) {
 				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+				$this->addResult($child, ltrim($path.'/'.$child['name'], '/'));
 			}
 
 			$existingCache = $this->cache->getFolderContentsById($id);
 			foreach ($existingCache as $existingChild) {
 				// if an existing child is not in the new data, remove it
 				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+					$this->cache->remove(ltrim($path.'/'.$existingChild['name'], '/'));
 				}
 			}
 		}

Indentation +87 added lines, -87 removed lines

@@ -33,97 +33,97 @@
 use OCP\Files\StorageNotAvailableException;
 
 class Scanner extends \OC\Files\Cache\Scanner {
-	/** @var \OCA\Files_Sharing\External\Storage */
-	protected $storage;
+    /** @var \OCA\Files_Sharing\External\Storage */
+    protected $storage;
 
-	/** {@inheritDoc} */
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		if (!$this->storage->remoteIsOwnCloud()) {
-			return parent::scan($path, $recursive, $recursive, $lock);
-		}
+    /** {@inheritDoc} */
+    public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
+        if (!$this->storage->remoteIsOwnCloud()) {
+            return parent::scan($path, $recursive, $recursive, $lock);
+        }
 
-		$this->scanAll();
-	}
+        $this->scanAll();
+    }
 
-	/**
-	 * Scan a single file and store it in the cache.
-	 * If an exception happened while accessing the external storage,
-	 * the storage will be checked for availability and removed
-	 * if it is not available any more.
-	 *
-	 * @param string $file file to scan
-	 * @param int $reuseExisting
-	 * @param int $parentId
-	 * @param array | null $cacheData existing data in the cache for the file to be scanned
-	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array | null an array of metadata of the scanned file
-	 */
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true, $data = null) {
-		try {
-			return parent::scanFile($file, $reuseExisting);
-		} catch (ForbiddenException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (NotFoundException $e) {
-			// if the storage isn't found, the call to
-			// checkStorageAvailable() will verify it and remove it
-			// if appropriate
-			$this->storage->checkStorageAvailability();
-		} catch (StorageInvalidException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (StorageNotAvailableException $e) {
-			$this->storage->checkStorageAvailability();
-		}
-	}
+    /**
+     * Scan a single file and store it in the cache.
+     * If an exception happened while accessing the external storage,
+     * the storage will be checked for availability and removed
+     * if it is not available any more.
+     *
+     * @param string $file file to scan
+     * @param int $reuseExisting
+     * @param int $parentId
+     * @param array | null $cacheData existing data in the cache for the file to be scanned
+     * @param bool $lock set to false to disable getting an additional read lock during scanning
+     * @return array | null an array of metadata of the scanned file
+     */
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true, $data = null) {
+        try {
+            return parent::scanFile($file, $reuseExisting);
+        } catch (ForbiddenException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (NotFoundException $e) {
+            // if the storage isn't found, the call to
+            // checkStorageAvailable() will verify it and remove it
+            // if appropriate
+            $this->storage->checkStorageAvailability();
+        } catch (StorageInvalidException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (StorageNotAvailableException $e) {
+            $this->storage->checkStorageAvailability();
+        }
+    }
 
-	/**
-	 * Checks the remote share for changes.
-	 * If changes are available, scan them and update
-	 * the cache.
-	 * @throws NotFoundException
-	 * @throws StorageInvalidException
-	 * @throws \Exception
-	 */
-	public function scanAll() {
-		try {
-			$data = $this->storage->getShareInfo();
-		} catch (\Exception $e) {
-			$this->storage->checkStorageAvailability();
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
-				$e->getMessage()
-			);
-		}
-		if ($data['status'] === 'success') {
-			$this->addResult($data['data'], '');
-		} else {
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
-			);
-		}
-	}
+    /**
+     * Checks the remote share for changes.
+     * If changes are available, scan them and update
+     * the cache.
+     * @throws NotFoundException
+     * @throws StorageInvalidException
+     * @throws \Exception
+     */
+    public function scanAll() {
+        try {
+            $data = $this->storage->getShareInfo();
+        } catch (\Exception $e) {
+            $this->storage->checkStorageAvailability();
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '" ' .
+                $e->getMessage()
+            );
+        }
+        if ($data['status'] === 'success') {
+            $this->addResult($data['data'], '');
+        } else {
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '"'
+            );
+        }
+    }
 
-	/**
-	 * @param array $data
-	 * @param string $path
-	 */
-	private function addResult($data, $path) {
-		$id = $this->cache->put($path, $data);
-		if (isset($data['children'])) {
-			$children = [];
-			foreach ($data['children'] as $child) {
-				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
-			}
+    /**
+     * @param array $data
+     * @param string $path
+     */
+    private function addResult($data, $path) {
+        $id = $this->cache->put($path, $data);
+        if (isset($data['children'])) {
+            $children = [];
+            foreach ($data['children'] as $child) {
+                $children[$child['name']] = true;
+                $this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+            }
 
-			$existingCache = $this->cache->getFolderContentsById($id);
-			foreach ($existingCache as $existingChild) {
-				// if an existing child is not in the new data, remove it
-				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
-				}
-			}
-		}
-	}
+            $existingCache = $this->cache->getFolderContentsById($id);
+            foreach ($existingCache as $existingChild) {
+                // if an existing child is not in the new data, remove it
+                if (!isset($children[$existingChild['name']])) {
+                    $this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+                }
+            }
+        }
+    }
 }

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/testing/lib/Controller/LockingController.php

Spacing +6 added lines, -6 removed lines

@@ -100,7 +100,7 @@ 
 	 */
 	protected function getPath($user, $path) {
 		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+		return 'files/'.md5($node->getStorage()->getId().'::'.trim($node->getInternalPath(), '/'));
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 
 		try {
 			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
+			$this->config->setAppValue('testing', 'locking_'.$path, $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -163,7 +163,7 @@ 
 
 		try {
 			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
+			$this->config->setAppValue('testing', 'locking_'.$path, $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -190,7 +190,7 @@ 
 
 		try {
 			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
+			$this->config->deleteAppValue('testing', 'locking_'.$path);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -233,9 +233,9 @@ 
 			if (strpos($lock, 'locking_') === 0) {
 				$path = substr($lock, strlen('locking_'));
 
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
 					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+				} elseif ($type === ILockingProvider::LOCK_SHARED && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
 					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
 				} else {
 					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));

Indentation +204 added lines, -204 removed lines

@@ -39,208 +39,208 @@
 
 class LockingController extends OCSController {
 
-	/** @var ILockingProvider */
-	protected $lockingProvider;
-
-	/** @var FakeDBLockingProvider */
-	protected $fakeDBLockingProvider;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ILockingProvider $lockingProvider
-	 * @param FakeDBLockingProvider $fakeDBLockingProvider
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								ILockingProvider $lockingProvider,
-								FakeDBLockingProvider $fakeDBLockingProvider,
-								IDBConnection $connection,
-								IConfig $config,
-								IRootFolder $rootFolder) {
-		parent::__construct($appName, $request);
-
-		$this->lockingProvider = $lockingProvider;
-		$this->fakeDBLockingProvider = $fakeDBLockingProvider;
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-	}
-
-	/**
-	 * @return ILockingProvider
-	 * @throws \RuntimeException
-	 */
-	protected function getLockingProvider() {
-		if ($this->lockingProvider instanceof DBLockingProvider) {
-			return $this->fakeDBLockingProvider;
-		}
-		throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
-	}
-
-	/**
-	 * @param string $user
-	 * @param string $path
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getPath($user, $path) {
-		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
-	}
-
-	/**
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function isLockingEnabled() {
-		try {
-			$this->getLockingProvider();
-			return new DataResponse();
-		} catch (\RuntimeException $e) {
-			throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function acquireLock($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function changeLock($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function releaseLock($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $user
-	 * @param string $path
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function isLocked($type, $user, $path) {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		if ($lockingProvider->isLocked($path, $type)) {
-			return new DataResponse();
-		}
-
-		throw new OCSException('', Http::STATUS_LOCKED);
-	}
-
-	/**
-	 * @param int $type
-	 * @return DataResponse
-	 */
-	public function releaseAll($type = null) {
-		$lockingProvider = $this->getLockingProvider();
-
-		foreach ($this->config->getAppKeys('testing') as $lock) {
-			if (strpos($lock, 'locking_') === 0) {
-				$path = substr($lock, strlen('locking_'));
-
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				}
-			}
-		}
-
-		return new DataResponse();
-	}
+    /** @var ILockingProvider */
+    protected $lockingProvider;
+
+    /** @var FakeDBLockingProvider */
+    protected $fakeDBLockingProvider;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param ILockingProvider $lockingProvider
+     * @param FakeDBLockingProvider $fakeDBLockingProvider
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                ILockingProvider $lockingProvider,
+                                FakeDBLockingProvider $fakeDBLockingProvider,
+                                IDBConnection $connection,
+                                IConfig $config,
+                                IRootFolder $rootFolder) {
+        parent::__construct($appName, $request);
+
+        $this->lockingProvider = $lockingProvider;
+        $this->fakeDBLockingProvider = $fakeDBLockingProvider;
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+    }
+
+    /**
+     * @return ILockingProvider
+     * @throws \RuntimeException
+     */
+    protected function getLockingProvider() {
+        if ($this->lockingProvider instanceof DBLockingProvider) {
+            return $this->fakeDBLockingProvider;
+        }
+        throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
+    }
+
+    /**
+     * @param string $user
+     * @param string $path
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getPath($user, $path) {
+        $node = $this->rootFolder->getUserFolder($user)->get($path);
+        return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+    }
+
+    /**
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function isLockingEnabled() {
+        try {
+            $this->getLockingProvider();
+            return new DataResponse();
+        } catch (\RuntimeException $e) {
+            throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function acquireLock($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->acquireLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function changeLock($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->changeLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function releaseLock($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->releaseLock($path, $type);
+            $this->config->deleteAppValue('testing', 'locking_' . $path);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @param int $type
+     * @param string $user
+     * @param string $path
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function isLocked($type, $user, $path) {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        if ($lockingProvider->isLocked($path, $type)) {
+            return new DataResponse();
+        }
+
+        throw new OCSException('', Http::STATUS_LOCKED);
+    }
+
+    /**
+     * @param int $type
+     * @return DataResponse
+     */
+    public function releaseAll($type = null) {
+        $lockingProvider = $this->getLockingProvider();
+
+        foreach ($this->config->getAppKeys('testing') as $lock) {
+            if (strpos($lock, 'locking_') === 0) {
+                $path = substr($lock, strlen('locking_'));
+
+                if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                }
+            }
+        }
+
+        return new DataResponse();
+    }
 }

apps/files_external/lib/Lib/PriorityTrait.php

Indentation +24 added lines, -24 removed lines

@@ -29,31 +29,31 @@
  */
 trait PriorityTrait {
 
-	/** @var int initial priority */
-	protected $priority = BackendService::PRIORITY_DEFAULT;
+    /** @var int initial priority */
+    protected $priority = BackendService::PRIORITY_DEFAULT;
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * @param int $priority
-	 * @return self
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-		return $this;
-	}
+    /**
+     * @param int $priority
+     * @return self
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+        return $this;
+    }
 
-	/**
-	 * @param PriorityTrait $a
-	 * @param PriorityTrait $b
-	 * @return int
-	 */
-	public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
-		return ($a->getPriority() - $b->getPriority());
-	}
+    /**
+     * @param PriorityTrait $a
+     * @param PriorityTrait $b
+     * @return int
+     */
+    public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
+        return ($a->getPriority() - $b->getPriority());
+    }
 }