nextcloud / server

lib/private/Repair/NC16/ClearCollectionsAccessCache.php

Indentation +25 added lines, -25 removed lines

@@ -32,29 +32,29 @@
 use OCP\Migration\IRepairStep;
 
 class ClearCollectionsAccessCache implements IRepairStep {
-	/** @var IConfig */
-	private $config;
-
-	/** @var Manager */
-	private $manager;
-
-	public function __construct(IConfig $config, IManager $manager) {
-		$this->config = $config;
-		$this->manager = $manager;
-	}
-
-	public function getName(): string {
-		return 'Clear access cache of projects';
-	}
-
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
-		return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
-	}
-
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->manager->invalidateAccessCacheForAllCollections();
-		}
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var Manager */
+    private $manager;
+
+    public function __construct(IConfig $config, IManager $manager) {
+        $this->config = $config;
+        $this->manager = $manager;
+    }
+
+    public function getName(): string {
+        return 'Clear access cache of projects';
+    }
+
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
+        return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
+    }
+
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->manager->invalidateAccessCacheForAllCollections();
+        }
+    }
 }

lib/private/L10N/LanguageIterator.php

Indentation +103 added lines, -103 removed lines

@@ -31,114 +31,114 @@
 use OCP\L10N\ILanguageIterator;
 
 class LanguageIterator implements ILanguageIterator {
-	private $i = 0;
-	/** @var IConfig */
-	private $config;
-	/** @var IUser */
-	private $user;
+    private $i = 0;
+    /** @var IConfig */
+    private $config;
+    /** @var IUser */
+    private $user;
 
-	public function __construct(IUser $user, IConfig $config) {
-		$this->config = $config;
-		$this->user = $user;
-	}
+    public function __construct(IUser $user, IConfig $config) {
+        $this->config = $config;
+        $this->user = $user;
+    }
 
-	/**
-	 * Rewind the Iterator to the first element
-	 */
-	public function rewind(): void {
-		$this->i = 0;
-	}
+    /**
+     * Rewind the Iterator to the first element
+     */
+    public function rewind(): void {
+        $this->i = 0;
+    }
 
-	/**
-	 * Return the current element
-	 *
-	 * @since 14.0.0
-	 */
-	public function current(): string {
-		switch ($this->i) {
-			/** @noinspection PhpMissingBreakStatementInspection */
-			case 0:
-				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if (is_string($forcedLang)) {
-					return $forcedLang;
-				}
-				$this->next();
-				/** @noinspection PhpMissingBreakStatementInspection */
-				// no break
-			case 1:
-				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if (is_string($forcedLang)
-					&& ($truncated = $this->getTruncatedLanguage($forcedLang)) !== $forcedLang
-				) {
-					return $truncated;
-				}
-				$this->next();
-				/** @noinspection PhpMissingBreakStatementInspection */
-				// no break
-			case 2:
-				$userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
-				if (is_string($userLang)) {
-					return $userLang;
-				}
-				$this->next();
-				/** @noinspection PhpMissingBreakStatementInspection */
-				// no break
-			case 3:
-				$userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
-				if (is_string($userLang)
-					&& ($truncated = $this->getTruncatedLanguage($userLang)) !== $userLang
-				) {
-					return $truncated;
-				}
-				$this->next();
-				// no break
-			case 4:
-				return $this->config->getSystemValueString('default_language', 'en');
-				/** @noinspection PhpMissingBreakStatementInspection */
-			case 5:
-				$defaultLang = $this->config->getSystemValueString('default_language', 'en');
-				if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) {
-					return $truncated;
-				}
-				$this->next();
-				// no break
-			default:
-				return 'en';
-		}
-	}
+    /**
+     * Return the current element
+     *
+     * @since 14.0.0
+     */
+    public function current(): string {
+        switch ($this->i) {
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 0:
+                $forcedLang = $this->config->getSystemValue('force_language', false);
+                if (is_string($forcedLang)) {
+                    return $forcedLang;
+                }
+                $this->next();
+                /** @noinspection PhpMissingBreakStatementInspection */
+                // no break
+            case 1:
+                $forcedLang = $this->config->getSystemValue('force_language', false);
+                if (is_string($forcedLang)
+                    && ($truncated = $this->getTruncatedLanguage($forcedLang)) !== $forcedLang
+                ) {
+                    return $truncated;
+                }
+                $this->next();
+                /** @noinspection PhpMissingBreakStatementInspection */
+                // no break
+            case 2:
+                $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
+                if (is_string($userLang)) {
+                    return $userLang;
+                }
+                $this->next();
+                /** @noinspection PhpMissingBreakStatementInspection */
+                // no break
+            case 3:
+                $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
+                if (is_string($userLang)
+                    && ($truncated = $this->getTruncatedLanguage($userLang)) !== $userLang
+                ) {
+                    return $truncated;
+                }
+                $this->next();
+                // no break
+            case 4:
+                return $this->config->getSystemValueString('default_language', 'en');
+                /** @noinspection PhpMissingBreakStatementInspection */
+            case 5:
+                $defaultLang = $this->config->getSystemValueString('default_language', 'en');
+                if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) {
+                    return $truncated;
+                }
+                $this->next();
+                // no break
+            default:
+                return 'en';
+        }
+    }
 
-	/**
-	 * Move forward to next element
-	 *
-	 * @since 14.0.0
-	 */
-	public function next(): void {
-		++$this->i;
-	}
+    /**
+     * Move forward to next element
+     *
+     * @since 14.0.0
+     */
+    public function next(): void {
+        ++$this->i;
+    }
 
-	/**
-	 * Return the key of the current element
-	 *
-	 * @since 14.0.0
-	 */
-	public function key(): int {
-		return $this->i;
-	}
+    /**
+     * Return the key of the current element
+     *
+     * @since 14.0.0
+     */
+    public function key(): int {
+        return $this->i;
+    }
 
-	/**
-	 * Checks if current position is valid
-	 *
-	 * @since 14.0.0
-	 */
-	public function valid(): bool {
-		return $this->i <= 6;
-	}
+    /**
+     * Checks if current position is valid
+     *
+     * @since 14.0.0
+     */
+    public function valid(): bool {
+        return $this->i <= 6;
+    }
 
-	protected function getTruncatedLanguage(string $lang):string {
-		$pos = strpos($lang, '_');
-		if ($pos !== false) {
-			$lang = substr($lang, 0, $pos);
-		}
-		return $lang;
-	}
+    protected function getTruncatedLanguage(string $lang):string {
+        $pos = strpos($lang, '_');
+        if ($pos !== false) {
+            $lang = substr($lang, 0, $pos);
+        }
+        return $lang;
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Indentation +33 added lines, -33 removed lines

@@ -28,42 +28,42 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders;
+    private $excludedFolders;
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach ($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach ($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
-		if ($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
+        if ($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	public function accept(): bool {
-		return !\in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    public function accept(): bool {
+        return !\in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

lib/private/Files/Mount/CacheMountProvider.php

Indentation +35 added lines, -35 removed lines

@@ -30,42 +30,42 @@
  * Mount provider for custom cache storages
  */
 class CacheMountProvider implements IMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$cacheBaseDir = $this->config->getSystemValueString('cache_path', '');
-		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
-			if (!file_exists($cacheDir)) {
-				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
-			}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $cacheBaseDir = $this->config->getSystemValueString('cache_path', '');
+        if ($cacheBaseDir !== '') {
+            $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+            if (!file_exists($cacheDir)) {
+                mkdir($cacheDir, 0770, true);
+                mkdir($cacheDir . '/uploads', 0770, true);
+            }
 
-			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class)
-			];
-		} else {
-			return [];
-		}
-	}
+            return [
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class)
+            ];
+        } else {
+            return [];
+        }
+    }
 }

lib/private/Authentication/Login/FinishRememberedLoginCommand.php

Indentation +14 added lines, -14 removed lines

@@ -30,21 +30,21 @@
 use OCP\IConfig;
 
 class FinishRememberedLoginCommand extends ALoginCommand {
-	/** @var Session */
-	private $userSession;
-	/** @var IConfig */
-	private $config;
+    /** @var Session */
+    private $userSession;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(Session $userSession, IConfig $config) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-	}
+    public function __construct(Session $userSession, IConfig $config) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+    }
 
-	public function process(LoginData $loginData): LoginResult {
-		if ($loginData->isRememberLogin() && !$this->config->getSystemValueBool('auto_logout', false)) {
-			$this->userSession->createRememberMeToken($loginData->getUser());
-		}
+    public function process(LoginData $loginData): LoginResult {
+        if ($loginData->isRememberLogin() && !$this->config->getSystemValueBool('auto_logout', false)) {
+            $this->userSession->createRememberMeToken($loginData->getUser());
+        }
 
-		return $this->processNextOrFinishSuccessfully($loginData);
-	}
+        return $this->processNextOrFinishSuccessfully($loginData);
+    }
 }

lib/public/BackgroundJob/IParallelAwareJob.php

Indentation +13 added lines, -13 removed lines

@@ -30,18 +30,18 @@
  * @since 27.0.0
  */
 interface IParallelAwareJob {
-	/**
-	 * Set this to false to prevent two Jobs from the same class from running in parallel
-	 *
-	 * @param bool $allow
-	 * @return void
-	 * @since 27.0.0
-	 */
-	public function setAllowParallelRuns(bool $allow): void;
+    /**
+     * Set this to false to prevent two Jobs from the same class from running in parallel
+     *
+     * @param bool $allow
+     * @return void
+     * @since 27.0.0
+     */
+    public function setAllowParallelRuns(bool $allow): void;
 
-	/**
-	 * @return bool
-	 * @since 27.0.0
-	 */
-	public function getAllowParallelRuns(): bool;
+    /**
+     * @return bool
+     * @since 27.0.0
+     */
+    public function getAllowParallelRuns(): bool;
 }

lib/public/Files/File.php

Indentation +63 added lines, -63 removed lines

@@ -35,73 +35,73 @@
  * @since 6.0.0
  */
 interface File extends Node {
-	/**
-	 * Get the content of the file as string
-	 *
-	 * @return string
-	 * @throws NotPermittedException
-	 * @throws GenericFileException
-	 * @throws LockedException
-	 * @since 6.0.0
-	 */
-	public function getContent();
+    /**
+     * Get the content of the file as string
+     *
+     * @return string
+     * @throws NotPermittedException
+     * @throws GenericFileException
+     * @throws LockedException
+     * @since 6.0.0
+     */
+    public function getContent();
 
-	/**
-	 * Write to the file from string data
-	 *
-	 * @param string|resource $data
-	 * @throws NotPermittedException
-	 * @throws GenericFileException
-	 * @throws LockedException
-	 * @since 6.0.0
-	 */
-	public function putContent($data);
+    /**
+     * Write to the file from string data
+     *
+     * @param string|resource $data
+     * @throws NotPermittedException
+     * @throws GenericFileException
+     * @throws LockedException
+     * @since 6.0.0
+     */
+    public function putContent($data);
 
-	/**
-	 * Get the mimetype of the file
-	 *
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getMimeType();
+    /**
+     * Get the mimetype of the file
+     *
+     * @return string
+     * @since 6.0.0
+     */
+    public function getMimeType();
 
-	/**
-	 * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @param string $mode
-	 * @return resource|false
-	 * @throws NotPermittedException
-	 * @throws LockedException
-	 * @since 6.0.0
-	 */
-	public function fopen($mode);
+    /**
+     * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @param string $mode
+     * @return resource|false
+     * @throws NotPermittedException
+     * @throws LockedException
+     * @since 6.0.0
+     */
+    public function fopen($mode);
 
-	/**
-	 * Compute the hash of the file
-	 * Type of hash is set with $type and can be anything supported by php's hash_file
-	 *
-	 * @param string $type
-	 * @param bool $raw
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function hash($type, $raw = false);
+    /**
+     * Compute the hash of the file
+     * Type of hash is set with $type and can be anything supported by php's hash_file
+     *
+     * @param string $type
+     * @param bool $raw
+     * @return string
+     * @since 6.0.0
+     */
+    public function hash($type, $raw = false);
 
-	/**
-	 * Get the stored checksum for this file
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getChecksum();
+    /**
+     * Get the stored checksum for this file
+     *
+     * @return string
+     * @since 9.0.0
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getChecksum();
 
-	/**
-	 * Get the extension of this file
-	 *
-	 * @return string
-	 * @since 15.0.0
-	 */
-	public function getExtension(): string;
+    /**
+     * Get the extension of this file
+     *
+     * @return string
+     * @since 15.0.0
+     */
+    public function getExtension(): string;
 }

lib/private/Files/Node/File.php

Indentation +117 added lines, -117 removed lines

@@ -33,129 +33,129 @@
 use OCP\Lock\LockedException;
 
 class File extends Node implements \OCP\Files\File {
-	/**
-	 * Creates a Folder that represents a non-existing path
-	 *
-	 * @param string $path path
-	 * @return NonExistingFile non-existing node
-	 */
-	protected function createNonExistingNode($path) {
-		return new NonExistingFile($this->root, $this->view, $path);
-	}
+    /**
+     * Creates a Folder that represents a non-existing path
+     *
+     * @param string $path path
+     * @return NonExistingFile non-existing node
+     */
+    protected function createNonExistingNode($path) {
+        return new NonExistingFile($this->root, $this->view, $path);
+    }
 
-	/**
-	 * @return string
-	 * @throws NotPermittedException
-	 * @throws GenericFileException
-	 * @throws LockedException
-	 */
-	public function getContent() {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_READ)) {
-			$content = $this->view->file_get_contents($this->path);
-			if ($content === false) {
-				throw new GenericFileException();
-			}
-			return $content;
-		} else {
-			throw new NotPermittedException();
-		}
-	}
+    /**
+     * @return string
+     * @throws NotPermittedException
+     * @throws GenericFileException
+     * @throws LockedException
+     */
+    public function getContent() {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_READ)) {
+            $content = $this->view->file_get_contents($this->path);
+            if ($content === false) {
+                throw new GenericFileException();
+            }
+            return $content;
+        } else {
+            throw new NotPermittedException();
+        }
+    }
 
-	/**
-	 * @param string|resource $data
-	 * @throws NotPermittedException
-	 * @throws GenericFileException
-	 * @throws LockedException
-	 */
-	public function putContent($data) {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
-			$this->sendHooks(['preWrite']);
-			if ($this->view->file_put_contents($this->path, $data) === false) {
-				throw new GenericFileException('file_put_contents failed');
-			}
-			$this->fileInfo = null;
-			$this->sendHooks(['postWrite']);
-		} else {
-			throw new NotPermittedException();
-		}
-	}
+    /**
+     * @param string|resource $data
+     * @throws NotPermittedException
+     * @throws GenericFileException
+     * @throws LockedException
+     */
+    public function putContent($data) {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
+            $this->sendHooks(['preWrite']);
+            if ($this->view->file_put_contents($this->path, $data) === false) {
+                throw new GenericFileException('file_put_contents failed');
+            }
+            $this->fileInfo = null;
+            $this->sendHooks(['postWrite']);
+        } else {
+            throw new NotPermittedException();
+        }
+    }
 
-	/**
-	 * @param string $mode
-	 * @return resource|false
-	 * @throws NotPermittedException
-	 * @throws LockedException
-	 */
-	public function fopen($mode) {
-		$preHooks = [];
-		$postHooks = [];
-		$requiredPermissions = \OCP\Constants::PERMISSION_READ;
-		switch ($mode) {
-			case 'r+':
-			case 'rb+':
-			case 'w+':
-			case 'wb+':
-			case 'x+':
-			case 'xb+':
-			case 'a+':
-			case 'ab+':
-			case 'w':
-			case 'wb':
-			case 'x':
-			case 'xb':
-			case 'a':
-			case 'ab':
-				$preHooks[] = 'preWrite';
-				$postHooks[] = 'postWrite';
-				$requiredPermissions |= \OCP\Constants::PERMISSION_UPDATE;
-				break;
-		}
+    /**
+     * @param string $mode
+     * @return resource|false
+     * @throws NotPermittedException
+     * @throws LockedException
+     */
+    public function fopen($mode) {
+        $preHooks = [];
+        $postHooks = [];
+        $requiredPermissions = \OCP\Constants::PERMISSION_READ;
+        switch ($mode) {
+            case 'r+':
+            case 'rb+':
+            case 'w+':
+            case 'wb+':
+            case 'x+':
+            case 'xb+':
+            case 'a+':
+            case 'ab+':
+            case 'w':
+            case 'wb':
+            case 'x':
+            case 'xb':
+            case 'a':
+            case 'ab':
+                $preHooks[] = 'preWrite';
+                $postHooks[] = 'postWrite';
+                $requiredPermissions |= \OCP\Constants::PERMISSION_UPDATE;
+                break;
+        }
 
-		if ($this->checkPermissions($requiredPermissions)) {
-			$this->sendHooks($preHooks);
-			$result = $this->view->fopen($this->path, $mode);
-			$this->sendHooks($postHooks);
-			return $result;
-		} else {
-			throw new NotPermittedException();
-		}
-	}
+        if ($this->checkPermissions($requiredPermissions)) {
+            $this->sendHooks($preHooks);
+            $result = $this->view->fopen($this->path, $mode);
+            $this->sendHooks($postHooks);
+            return $result;
+        } else {
+            throw new NotPermittedException();
+        }
+    }
 
-	/**
-	 * @throws NotPermittedException
-	 * @throws \OCP\Files\InvalidPathException
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function delete() {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_DELETE)) {
-			$this->sendHooks(['preDelete']);
-			$fileInfo = $this->getFileInfo();
-			$this->view->unlink($this->path);
-			$nonExisting = new NonExistingFile($this->root, $this->view, $this->path, $fileInfo);
-			$this->sendHooks(['postDelete'], [$nonExisting]);
-			$this->fileInfo = null;
-		} else {
-			throw new NotPermittedException();
-		}
-	}
+    /**
+     * @throws NotPermittedException
+     * @throws \OCP\Files\InvalidPathException
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function delete() {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_DELETE)) {
+            $this->sendHooks(['preDelete']);
+            $fileInfo = $this->getFileInfo();
+            $this->view->unlink($this->path);
+            $nonExisting = new NonExistingFile($this->root, $this->view, $this->path, $fileInfo);
+            $this->sendHooks(['postDelete'], [$nonExisting]);
+            $this->fileInfo = null;
+        } else {
+            throw new NotPermittedException();
+        }
+    }
 
-	/**
-	 * @param string $type
-	 * @param bool $raw
-	 * @return string
-	 */
-	public function hash($type, $raw = false) {
-		return $this->view->hash($type, $this->path, $raw);
-	}
+    /**
+     * @param string $type
+     * @param bool $raw
+     * @return string
+     */
+    public function hash($type, $raw = false) {
+        return $this->view->hash($type, $this->path, $raw);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getChecksum() {
-		return $this->getFileInfo()->getChecksum();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getChecksum() {
+        return $this->getFileInfo()->getChecksum();
+    }
 
-	public function getExtension(): string {
-		return $this->getFileInfo()->getExtension();
-	}
+    public function getExtension(): string {
+        return $this->getFileInfo()->getExtension();
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/TooManyRequests.php

Indentation +22 added lines, -22 removed lines

@@ -30,26 +30,26 @@
 use Sabre\DAV\Server;
 
 class TooManyRequests extends NotAuthenticated {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-
-	public function getHTTPCode() {
-		return 429;
-	}
-
-	/**
-	 * This method allows the exception to include additional information
-	 * into the WebDAV error response
-	 *
-	 * @param Server $server
-	 * @param DOMElement $errorNode
-	 * @return void
-	 */
-	public function serialize(Server $server, DOMElement $errorNode) {
-
-		// set ownCloud namespace
-		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
-
-		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'too many requests');
-		$errorNode->appendChild($error);
-	}
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+    public function getHTTPCode() {
+        return 429;
+    }
+
+    /**
+     * This method allows the exception to include additional information
+     * into the WebDAV error response
+     *
+     * @param Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Server $server, DOMElement $errorNode) {
+
+        // set ownCloud namespace
+        $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+
+        $error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'too many requests');
+        $errorNode->appendChild($error);
+    }
 }