summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/Connector
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-20 20:18:47 +0200
committerGitHub <noreply@github.com>2016-10-20 20:18:47 +0200
commit98c846456417989d995fe868731e2b1bd77f0f37 (patch)
tree6b11fb1cb8352ae557e1b8ef3f19cc569b706341 /apps/dav/lib/Connector
parent4c41ff11ac90a0a205cdfa8802d10a0f488a0cd5 (diff)
parent08d688410747eba59c893a624942e9836749aa60 (diff)
downloadnextcloud-server-98c846456417989d995fe868731e2b1bd77f0f37.tar.gz
nextcloud-server-98c846456417989d995fe868731e2b1bd77f0f37.zip
Merge pull request #1821 from nextcloud/downstream-26366
Code style changes from downstream
Diffstat (limited to 'apps/dav/lib/Connector')
-rw-r--r--apps/dav/lib/Connector/Sabre/QuotaPlugin.php21
1 files changed, 13 insertions, 8 deletions
diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
index 484bb5129e8..4aef5fc8a5a 100644
--- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -25,6 +25,11 @@
*
*/
namespace OCA\DAV\Connector\Sabre;
+use OCP\Files\FileInfo;
+use OCP\Files\StorageNotAvailableException;
+use Sabre\DAV\Exception\InsufficientStorage;
+use Sabre\DAV\Exception\ServiceUnavailable;
+use Sabre\HTTP\URLUtil;
/**
* This plugin check user quota and deny creating files when they exceeds the quota.
@@ -77,17 +82,16 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
* This method is called before any HTTP method and validates there is enough free space to store the file
*
* @param string $uri
- * @param null $data
- * @throws \Sabre\DAV\Exception\InsufficientStorage
+ * @throws InsufficientStorage
* @return bool
*/
- public function checkQuota($uri, $data = null) {
+ public function checkQuota($uri) {
$length = $this->getLength();
if ($length) {
if (substr($uri, 0, 1) !== '/') {
$uri = '/' . $uri;
}
- list($parentUri, $newName) = \Sabre\HTTP\URLUtil::splitPath($uri);
+ list($parentUri, $newName) = URLUtil::splitPath($uri);
if(is_null($parentUri)) {
$parentUri = '';
}
@@ -102,11 +106,11 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
$uri = rtrim($parentUri, '/') . '/' . $info['name'];
}
$freeSpace = $this->getFreeSpace($uri);
- if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN && $length > $freeSpace) {
+ if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $length > $freeSpace) {
if (isset($chunkHandler)) {
$chunkHandler->cleanup();
}
- throw new \Sabre\DAV\Exception\InsufficientStorage();
+ throw new InsufficientStorage();
}
}
return true;
@@ -136,13 +140,14 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
/**
* @param string $uri
* @return mixed
+ * @throws ServiceUnavailable
*/
public function getFreeSpace($uri) {
try {
$freeSpace = $this->view->free_space(ltrim($uri, '/'));
return $freeSpace;
- } catch (\OCP\Files\StorageNotAvailableException $e) {
- throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ } catch (StorageNotAvailableException $e) {
+ throw new ServiceUnavailable($e->getMessage());
}
}
}