nextcloud / server

apps/files_trashbin/lib/Sabre/TrashRoot.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashRoot($this->user);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolder($this->trashManager, $entry);
 			}

Indentation +71 added lines, -71 removed lines

@@ -37,75 +37,75 @@
 
 class TrashRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
-
-	/** @var ITrashManager  */
-	private $trashManager;
-
-	public function __construct(IUser $user, ITrashManager $trashManager) {
-		$this->user = $user;
-		$this->trashManager = $trashManager;
-	}
-
-	public function delete() {
-		\OCA\Files_Trashbin\Trashbin::deleteAll();
-		foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
-			$this->trashManager->removeItem($trashItem);
-		}
-	}
-
-	public function getName(): string {
-		return 'trash';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this trashbin');
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Not allowed to create files in the trashbin');
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Not allowed to create folders in the trashbin');
-	}
-
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashRoot($this->user);
-
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolder($this->trashManager, $entry);
-			}
-			return new TrashFile($this->trashManager, $entry);
-		}, $entries);
-
-		return $children;
-	}
-
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
-
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    /** @var IUser */
+    private $user;
+
+    /** @var ITrashManager  */
+    private $trashManager;
+
+    public function __construct(IUser $user, ITrashManager $trashManager) {
+        $this->user = $user;
+        $this->trashManager = $trashManager;
+    }
+
+    public function delete() {
+        \OCA\Files_Trashbin\Trashbin::deleteAll();
+        foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
+            $this->trashManager->removeItem($trashItem);
+        }
+    }
+
+    public function getName(): string {
+        return 'trash';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this trashbin');
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Not allowed to create files in the trashbin');
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Not allowed to create folders in the trashbin');
+    }
+
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashRoot($this->user);
+
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolder($this->trashManager, $entry);
+            }
+            return new TrashFile($this->trashManager, $entry);
+        }, $entries);
+
+        return $children;
+    }
+
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
+
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

apps/files_trashbin/lib/Sabre/AbstractTrashFolder.php

Indentation +36 added lines, -36 removed lines

@@ -29,49 +29,49 @@
 use Sabre\DAV\ICollection;
 
 abstract class AbstractTrashFolder extends AbstractTrash implements ICollection, ITrash {
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashFolder($this->data);
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolderFolder($this->trashManager, $entry);
-			}
-			return new TrashFolderFile($this->trashManager, $entry);
-		}, $entries);
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolderFolder($this->trashManager, $entry);
+            }
+            return new TrashFolderFile($this->trashManager, $entry);
+        }, $entries);
 
-		return $children;
-	}
+        return $children;
+    }
 
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
 
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
 
-		throw new NotFound();
-	}
+        throw new NotFound();
+    }
 
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolderFolder($this->trashManager, $entry);
 			}

apps/files_trashbin/lib/Sabre/TrashFile.php

Indentation +6 added lines, -6 removed lines

@@ -25,11 +25,11 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
+    }
 
-	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
-	}
+    public function getName(): string {
+        return $this->data->getName() . '.d' . $this->getLastModified();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 
 class TrashFile extends AbstractTrashFile {
 	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
+		return $this->data->getStorage()->fopen($this->data->getInternalPath().'.d'.$this->getLastModified(), 'rb');
 	}
 
 	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
+		return $this->data->getName().'.d'.$this->getLastModified();
 	}
 }

lib/private/Authentication/Exceptions/ExpiredTokenException.php

Indentation +9 added lines, -9 removed lines

@@ -26,16 +26,16 @@
 use OC\Authentication\Token\IToken;
 
 class ExpiredTokenException extends InvalidTokenException {
-	/** @var IToken */
-	private $token;
+    /** @var IToken */
+    private $token;
 
-	public function __construct(IToken $token) {
-		parent::__construct();
+    public function __construct(IToken $token) {
+        parent::__construct();
 
-		$this->token = $token;
-	}
+        $this->token = $token;
+    }
 
-	public function getToken(): IToken {
-		return $this->token;
-	}
+    public function getToken(): IToken {
+        return $this->token;
+    }
 }

apps/files_versions/lib/Versions/IVersionManager.php

Indentation +8 added lines, -8 removed lines

@@ -25,12 +25,12 @@
  * @since 15.0.0
  */
 interface IVersionManager extends IVersionBackend {
-	/**
-	 * Register a new backend
-	 *
-	 * @param string $storageType
-	 * @param IVersionBackend $backend
-	 * @since 15.0.0
-	 */
-	public function registerBackend(string $storageType, IVersionBackend $backend);
+    /**
+     * Register a new backend
+     *
+     * @param string $storageType
+     * @param IVersionBackend $backend
+     * @since 15.0.0
+     */
+    public function registerBackend(string $storageType, IVersionBackend $backend);
 }

apps/files_versions/lib/Sabre/VersionRoot.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	public function getChild($name) {
 		$userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
 
-		$fileId = (int)$name;
+		$fileId = (int) $name;
 		$nodes = $userFolder->getById($fileId);
 
 		if ($nodes === []) {

Indentation +53 added lines, -53 removed lines

@@ -36,74 +36,74 @@
 
 class VersionRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IVersionManager */
-	private $versionManager;
+    /** @var IVersionManager */
+    private $versionManager;
 
-	public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
-		$this->user = $user;
-		$this->rootFolder = $rootFolder;
-		$this->versionManager = $versionManager;
-	}
+    public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
+        $this->user = $user;
+        $this->rootFolder = $rootFolder;
+        $this->versionManager = $versionManager;
+    }
 
-	public function delete() {
-		throw new Forbidden();
-	}
+    public function delete() {
+        throw new Forbidden();
+    }
 
-	public function getName(): string {
-		return 'versions';
-	}
+    public function getName(): string {
+        return 'versions';
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 
-	public function getChild($name) {
-		$userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
+    public function getChild($name) {
+        $userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
 
-		$fileId = (int)$name;
-		$nodes = $userFolder->getById($fileId);
+        $fileId = (int)$name;
+        $nodes = $userFolder->getById($fileId);
 
-		if ($nodes === []) {
-			throw new NotFound();
-		}
+        if ($nodes === []) {
+            throw new NotFound();
+        }
 
-		$node = array_pop($nodes);
+        $node = array_pop($nodes);
 
-		if (!$node instanceof File) {
-			throw new NotFound();
-		}
+        if (!$node instanceof File) {
+            throw new NotFound();
+        }
 
-		return new VersionCollection($node, $this->user, $this->versionManager);
-	}
+        return new VersionCollection($node, $this->user, $this->versionManager);
+    }
 
-	public function getChildren(): array {
-		return [];
-	}
+    public function getChildren(): array {
+        return [];
+    }
 
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function getLastModified(): int {
-		return 0;
-	}
+    public function getLastModified(): int {
+        return 0;
+    }
 }

apps/files_versions/lib/Sabre/VersionFile.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	}
 
 	public function getETag(): string {
-		return (string)$this->version->getRevisionId();
+		return (string) $this->version->getRevisionId();
 	}
 
 	public function getSize(): int {
@@ -72,7 +72,7 @@ 
 	}
 
 	public function getName(): string {
-		return (string)$this->version->getRevisionId();
+		return (string) $this->version->getRevisionId();
 	}
 
 	public function setName($name) {

Indentation +58 added lines, -58 removed lines

@@ -32,62 +32,62 @@
 use Sabre\DAV\IFile;
 
 class VersionFile implements IFile {
-	/** @var IVersion */
-	private $version;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(IVersion $version, IVersionManager $versionManager) {
-		$this->version = $version;
-		$this->versionManager = $versionManager;
-	}
-
-	public function put($data) {
-		throw new Forbidden();
-	}
-
-	public function get() {
-		try {
-			return $this->versionManager->read($this->version);
-		} catch (NotFoundException $e) {
-			throw new NotFound();
-		}
-	}
-
-	public function getContentType(): string {
-		return $this->version->getMimeType();
-	}
-
-	public function getETag(): string {
-		return (string)$this->version->getRevisionId();
-	}
-
-	public function getSize(): int {
-		return $this->version->getSize();
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return (string)$this->version->getRevisionId();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return $this->version->getTimestamp();
-	}
-
-	public function rollBack() {
-		$this->versionManager->rollback($this->version);
-	}
-
-	public function getVersion(): IVersion {
-		return $this->version;
-	}
+    /** @var IVersion */
+    private $version;
+
+    /** @var IVersionManager */
+    private $versionManager;
+
+    public function __construct(IVersion $version, IVersionManager $versionManager) {
+        $this->version = $version;
+        $this->versionManager = $versionManager;
+    }
+
+    public function put($data) {
+        throw new Forbidden();
+    }
+
+    public function get() {
+        try {
+            return $this->versionManager->read($this->version);
+        } catch (NotFoundException $e) {
+            throw new NotFound();
+        }
+    }
+
+    public function getContentType(): string {
+        return $this->version->getMimeType();
+    }
+
+    public function getETag(): string {
+        return (string)$this->version->getRevisionId();
+    }
+
+    public function getSize(): int {
+        return $this->version->getSize();
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return (string)$this->version->getRevisionId();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return $this->version->getTimestamp();
+    }
+
+    public function rollBack() {
+        $this->versionManager->rollback($this->version);
+    }
+
+    public function getVersion(): IVersion {
+        return $this->version;
+    }
 }

apps/files_versions/lib/Sabre/VersionCollection.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	public function getChildren(): array {
 		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
 
-		return array_map(function (IVersion $version) {
+		return array_map(function(IVersion $version) {
 			return new VersionFile($version, $this->versionManager);
 		}, $versions);
 	}
@@ -97,7 +97,7 @@ 
 	}
 
 	public function getName(): string {
-		return (string)$this->file->getId();
+		return (string) $this->file->getId();
 	}
 
 	public function setName($name) {

Indentation +68 added lines, -68 removed lines

@@ -36,72 +36,72 @@
 
 class VersionCollection implements ICollection {
 
-	/** @var File */
-	private $file;
-
-	/** @var IUser */
-	private $user;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(File $file, IUser $user, IVersionManager $versionManager) {
-		$this->file = $file;
-		$this->user = $user;
-		$this->versionManager = $versionManager;
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function getChild($name) {
-		/** @var VersionFile[] $versions */
-		$versions = $this->getChildren();
-
-		foreach ($versions as $version) {
-			if ($version->getName() === $name) {
-				return $version;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function getChildren(): array {
-		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
-
-		return array_map(function (IVersion $version) {
-			return new VersionFile($version, $this->versionManager);
-		}, $versions);
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return (string)$this->file->getId();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    /** @var File */
+    private $file;
+
+    /** @var IUser */
+    private $user;
+
+    /** @var IVersionManager */
+    private $versionManager;
+
+    public function __construct(File $file, IUser $user, IVersionManager $versionManager) {
+        $this->file = $file;
+        $this->user = $user;
+        $this->versionManager = $versionManager;
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function getChild($name) {
+        /** @var VersionFile[] $versions */
+        $versions = $this->getChildren();
+
+        foreach ($versions as $version) {
+            if ($version->getName() === $name) {
+                return $version;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function getChildren(): array {
+        $versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
+
+        return array_map(function (IVersion $version) {
+            return new VersionFile($version, $this->versionManager);
+        }, $versions);
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return (string)$this->file->getId();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php

Indentation +52 added lines, -52 removed lines

@@ -32,60 +32,60 @@
 use OCP\User\Backend\IPasswordConfirmationBackend;
 
 class PasswordConfirmationMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var ISession */
-	private $session;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var array */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var ISession */
+    private $session;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var array */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
 
-	/**
-	 * PasswordConfirmationMiddleware constructor.
-	 *
-	 * @param ControllerMethodReflector $reflector
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-								ISession $session,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory) {
-		$this->reflector = $reflector;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * PasswordConfirmationMiddleware constructor.
+     *
+     * @param ControllerMethodReflector $reflector
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ControllerMethodReflector $reflector,
+                                ISession $session,
+                                IUserSession $userSession,
+                                ITimeFactory $timeFactory) {
+        $this->reflector = $reflector;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws NotConfirmedException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
-			$user = $this->userSession->getUser();
-			$backendClassName = '';
-			if ($user !== null) {
-				$backend = $user->getBackend();
-				if ($backend instanceof IPasswordConfirmationBackend) {
-					if (!$backend->canConfirmPassword($user->getUID())) {
-						return;
-					}
-				}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws NotConfirmedException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
+            $user = $this->userSession->getUser();
+            $backendClassName = '';
+            if ($user !== null) {
+                $backend = $user->getBackend();
+                if ($backend instanceof IPasswordConfirmationBackend) {
+                    if (!$backend->canConfirmPassword($user->getUID())) {
+                        return;
+                    }
+                }
 
-				$backendClassName = $user->getBackendClassName();
-			}
+                $backendClassName = $user->getBackendClassName();
+            }
 
-			$lastConfirm = (int) $this->session->get('last-password-confirm');
-			// we can't check the password against a SAML backend, so skip password confirmation in this case
-			if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
-				throw new NotConfirmedException();
-			}
-		}
-	}
+            $lastConfirm = (int) $this->session->get('last-password-confirm');
+            // we can't check the password against a SAML backend, so skip password confirmation in this case
+            if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
+                throw new NotConfirmedException();
+            }
+        }
+    }
 }