nextcloud / server

apps/files_trashbin/lib/Trash/LegacyTrashBackend.php

Spacing +6 added lines, -6 removed lines

@@ -52,8 +52,8 @@ 
 	private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
 		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
 		$isRoot = $parent === null;
-		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
-			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
+		return array_map(function(FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation().'/'.$file->getName();
 			if (!$originalLocation) {
 				$originalLocation = $file->getName();
 			}
@@ -61,7 +61,7 @@ 
 				$this,
 				$originalLocation,
 				$file->getMTime(),
-				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
+				$parentTrashPath.'/'.$file->getName().($isRoot ? '.d'.$file->getMtime() : ''),
 				$file,
 				$user
 			);
@@ -76,7 +76,7 @@ 
 	public function listTrashFolder(ITrashItem $folder): array {
 		$user = $folder->getUser();
 		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
-		return $this->mapTrashItems($entries, $user ,$folder);
+		return $this->mapTrashItems($entries, $user, $folder);
 	}
 
 	public function restoreItem(ITrashItem $item) {
@@ -86,7 +86,7 @@ 
 	public function removeItem(ITrashItem $item) {
 		$user = $item->getUser();
 		if ($item->isRootItem()) {
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+			$path = substr($item->getTrashPath(), 0, -strlen('.d'.$item->getDeletedTime()));
 			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
 		} else {
 			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
@@ -98,7 +98,7 @@ 
 		if (!$storage instanceof Storage) {
 			return false;
 		}
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+		$normalized = Filesystem::normalizePath($storage->getMountPoint().'/'.$internalPath, true, false, true);
 		$view = Filesystem::getView();
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
 			$this->deletedFiles[$normalized] = $normalized;

Indentation +85 added lines, -85 removed lines

@@ -35,99 +35,99 @@
 use OCP\IUser;
 
 class LegacyTrashBackend implements ITrashBackend {
-	/** @var array */
-	private $deletedFiles = [];
+    /** @var array */
+    private $deletedFiles = [];
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	public function __construct(IRootFolder $rootFolder) {
-		$this->rootFolder = $rootFolder;
-	}
+    public function __construct(IRootFolder $rootFolder) {
+        $this->rootFolder = $rootFolder;
+    }
 
-	/**
-	 * @param array $items
-	 * @param IUser $user
-	 * @param ITrashItem $parent
-	 * @return ITrashItem[]
-	 */
-	private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
-		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
-		$isRoot = $parent === null;
-		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
-			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
-			if (!$originalLocation) {
-				$originalLocation = $file->getName();
-			}
-			return new TrashItem(
-				$this,
-				$originalLocation,
-				$file->getMTime(),
-				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
-				$file,
-				$user
-			);
-		}, $items);
-	}
+    /**
+     * @param array $items
+     * @param IUser $user
+     * @param ITrashItem $parent
+     * @return ITrashItem[]
+     */
+    private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
+        $parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
+        $isRoot = $parent === null;
+        return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+            $originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
+            if (!$originalLocation) {
+                $originalLocation = $file->getName();
+            }
+            return new TrashItem(
+                $this,
+                $originalLocation,
+                $file->getMTime(),
+                $parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
+                $file,
+                $user
+            );
+        }, $items);
+    }
 
-	public function listTrashRoot(IUser $user): array {
-		$entries = Helper::getTrashFiles('/', $user->getUID());
-		return $this->mapTrashItems($entries, $user);
-	}
+    public function listTrashRoot(IUser $user): array {
+        $entries = Helper::getTrashFiles('/', $user->getUID());
+        return $this->mapTrashItems($entries, $user);
+    }
 
-	public function listTrashFolder(ITrashItem $folder): array {
-		$user = $folder->getUser();
-		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
-		return $this->mapTrashItems($entries, $user ,$folder);
-	}
+    public function listTrashFolder(ITrashItem $folder): array {
+        $user = $folder->getUser();
+        $entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
+        return $this->mapTrashItems($entries, $user ,$folder);
+    }
 
-	public function restoreItem(ITrashItem $item) {
-		Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
-	}
+    public function restoreItem(ITrashItem $item) {
+        Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
+    }
 
-	public function removeItem(ITrashItem $item) {
-		$user = $item->getUser();
-		if ($item->isRootItem()) {
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
-			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
-		} else {
-			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
-		}
-	}
+    public function removeItem(ITrashItem $item) {
+        $user = $item->getUser();
+        if ($item->isRootItem()) {
+            $path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+            Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
+        } else {
+            Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
+        }
+    }
 
-	public function moveToTrash(IStorage $storage, string $internalPath): bool {
-		if (!$storage instanceof Storage) {
-			return false;
-		}
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
-		$view = Filesystem::getView();
-		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
-			$this->deletedFiles[$normalized] = $normalized;
-			if ($filesPath = $view->getRelativePath($normalized)) {
-				$filesPath = trim($filesPath, '/');
-				$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
-			} else {
-				$result = false;
-			}
-			unset($this->deletedFiles[$normalized]);
-		} else {
-			$result = false;
-		}
+    public function moveToTrash(IStorage $storage, string $internalPath): bool {
+        if (!$storage instanceof Storage) {
+            return false;
+        }
+        $normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+        $view = Filesystem::getView();
+        if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
+            $this->deletedFiles[$normalized] = $normalized;
+            if ($filesPath = $view->getRelativePath($normalized)) {
+                $filesPath = trim($filesPath, '/');
+                $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
+            } else {
+                $result = false;
+            }
+            unset($this->deletedFiles[$normalized]);
+        } else {
+            $result = false;
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function getTrashNodeById(IUser $user, int $fileId) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-			$trash = $userFolder->getParent()->get('files_trashbin/files');
-			$trashFiles = $trash->getById($fileId);
-			if (!$trashFiles) {
-				return null;
-			}
-			return $trashFiles ? array_pop($trashFiles) : null;
-		} catch (NotFoundException $e) {
-			return null;
-		}
-	}
+    public function getTrashNodeById(IUser $user, int $fileId) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+            $trash = $userFolder->getParent()->get('files_trashbin/files');
+            $trashFiles = $trash->getById($fileId);
+            if (!$trashFiles) {
+                return null;
+            }
+            return $trashFiles ? array_pop($trashFiles) : null;
+        } catch (NotFoundException $e) {
+            return null;
+        }
+    }
 }

apps/files_versions/lib/Versions/LegacyVersionsBackend.php

Spacing +9 added lines, -9 removed lines

@@ -55,12 +55,12 @@ 
 		$file2 = array_pop($nodes);
 		$versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
 
-		return array_map(function (array $data) use ($file, $user) {
+		return array_map(function(array $data) use ($file, $user) {
 			return new Version(
-				(int)$data['version'],
-				(int)$data['version'],
+				(int) $data['version'],
+				(int) $data['version'],
 				$data['name'],
-				(int)$data['size'],
+				(int) $data['size'],
 				$data['mimetype'],
 				$data['path'],
 				$file,
@@ -73,16 +73,16 @@ 
 	public function createVersion(IUser $user, FileInfo $file) {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$relativePath = $userFolder->getRelativePath($file->getPath());
-		$userView = new View('/' . $user->getUID());
+		$userView = new View('/'.$user->getUID());
 		// create all parent folders
 		Storage::createMissingDirectories($relativePath, $userView);
 
 		Storage::scheduleExpire($user->getUID(), $relativePath);
 
 		// store a new version of a file
-		$userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
+		$userView->copy('files/'.$relativePath, 'files_versions/'.$relativePath.'.v'.$file->getMtime());
 		// ensure the file is scanned
-		$userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
+		$userView->getFileInfo('files_versions/'.$relativePath.'.v'.$file->getMtime());
 	}
 
 	public function rollback(IVersion $version) {
@@ -104,7 +104,7 @@ 
 	public function read(IVersion $version) {
 		$versions = $this->getVersionFolder($version->getUser());
 		/** @var File $file */
-		$file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
+		$file = $versions->get($version->getVersionPath().'.v'.$version->getRevisionId());
 		return $file->fopen('r');
 	}
 
@@ -112,7 +112,7 @@ 
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$versionFolder = $this->getVersionFolder($user);
 		/** @var File $file */
-		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
+		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()).'.v'.$revision);
 		return $file;
 	}
 }

Indentation +86 added lines, -86 removed lines

@@ -40,90 +40,90 @@
 use OCP\IUserManager;
 
 class LegacyVersionsBackend implements IVersionBackend {
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IUserManager */
-	private $userManager;
-
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-	}
-
-	public function useBackendForStorage(IStorage $storage): bool {
-		return true;
-	}
-
-	public function getVersionsForFile(IUser $user, FileInfo $file): array {
-		$storage = $file->getStorage();
-		if ($storage->instanceOfStorage(SharedStorage::class)) {
-			$owner = $storage->getOwner('');
-			$user = $this->userManager->get($owner);
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$nodes = $userFolder->getById($file->getId());
-		$file2 = array_pop($nodes);
-		$versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
-
-		return array_map(function (array $data) use ($file, $user) {
-			return new Version(
-				(int)$data['version'],
-				(int)$data['version'],
-				$data['name'],
-				(int)$data['size'],
-				$data['mimetype'],
-				$data['path'],
-				$file,
-				$this,
-				$user
-			);
-		}, $versions);
-	}
-
-	public function createVersion(IUser $user, FileInfo $file) {
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$relativePath = $userFolder->getRelativePath($file->getPath());
-		$userView = new View('/' . $user->getUID());
-		// create all parent folders
-		Storage::createMissingDirectories($relativePath, $userView);
-
-		Storage::scheduleExpire($user->getUID(), $relativePath);
-
-		// store a new version of a file
-		$userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
-		// ensure the file is scanned
-		$userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
-	}
-
-	public function rollback(IVersion $version) {
-		return Storage::rollback($version->getVersionPath(), $version->getRevisionId(), $version->getUser());
-	}
-
-	private function getVersionFolder(IUser $user): Folder {
-		$userRoot = $this->rootFolder->getUserFolder($user->getUID())
-			->getParent();
-		try {
-			/** @var Folder $folder */
-			$folder = $userRoot->get('files_versions');
-			return $folder;
-		} catch (NotFoundException $e) {
-			return $userRoot->newFolder('files_versions');
-		}
-	}
-
-	public function read(IVersion $version) {
-		$versions = $this->getVersionFolder($version->getUser());
-		/** @var File $file */
-		$file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
-		return $file->fopen('r');
-	}
-
-	public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File {
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$versionFolder = $this->getVersionFolder($user);
-		/** @var File $file */
-		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
-		return $file;
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IUserManager */
+    private $userManager;
+
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+    }
+
+    public function useBackendForStorage(IStorage $storage): bool {
+        return true;
+    }
+
+    public function getVersionsForFile(IUser $user, FileInfo $file): array {
+        $storage = $file->getStorage();
+        if ($storage->instanceOfStorage(SharedStorage::class)) {
+            $owner = $storage->getOwner('');
+            $user = $this->userManager->get($owner);
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $nodes = $userFolder->getById($file->getId());
+        $file2 = array_pop($nodes);
+        $versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
+
+        return array_map(function (array $data) use ($file, $user) {
+            return new Version(
+                (int)$data['version'],
+                (int)$data['version'],
+                $data['name'],
+                (int)$data['size'],
+                $data['mimetype'],
+                $data['path'],
+                $file,
+                $this,
+                $user
+            );
+        }, $versions);
+    }
+
+    public function createVersion(IUser $user, FileInfo $file) {
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $relativePath = $userFolder->getRelativePath($file->getPath());
+        $userView = new View('/' . $user->getUID());
+        // create all parent folders
+        Storage::createMissingDirectories($relativePath, $userView);
+
+        Storage::scheduleExpire($user->getUID(), $relativePath);
+
+        // store a new version of a file
+        $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
+        // ensure the file is scanned
+        $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
+    }
+
+    public function rollback(IVersion $version) {
+        return Storage::rollback($version->getVersionPath(), $version->getRevisionId(), $version->getUser());
+    }
+
+    private function getVersionFolder(IUser $user): Folder {
+        $userRoot = $this->rootFolder->getUserFolder($user->getUID())
+            ->getParent();
+        try {
+            /** @var Folder $folder */
+            $folder = $userRoot->get('files_versions');
+            return $folder;
+        } catch (NotFoundException $e) {
+            return $userRoot->newFolder('files_versions');
+        }
+    }
+
+    public function read(IVersion $version) {
+        $versions = $this->getVersionFolder($version->getUser());
+        /** @var File $file */
+        $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
+        return $file->fopen('r');
+    }
+
+    public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File {
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $versionFolder = $this->getVersionFolder($user);
+        /** @var File $file */
+        $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
+        return $file;
+    }
 }

apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 
 
 	public function setName($name) {
-		throw new Forbidden('Renaming ' . self::FILENAME . ' is forbidden');
+		throw new Forbidden('Renaming '.self::FILENAME.' is forbidden');
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 * @throws Forbidden
 	 */
 	public function delete() {
-		throw new Forbidden(self::FILENAME . ' may not be deleted.');
+		throw new Forbidden(self::FILENAME.' may not be deleted.');
 	}
 
 	/**
@@ -86,6 +86,6 @@ 
 	 * @throws Forbidden
 	 */
 	public function propPatch(PropPatch $propPatch) {
-		throw new Forbidden(self::FILENAME . '\'s properties may not be altered.');
+		throw new Forbidden(self::FILENAME.'\'s properties may not be altered.');
 	}
 }

Indentation +47 added lines, -47 removed lines

@@ -30,61 +30,61 @@
 use Sabre\DAV\PropPatch;
 
 class AppleProvisioningNode implements INode, IProperties {
-	public const FILENAME = 'apple-provisioning.mobileconfig';
+    public const FILENAME = 'apple-provisioning.mobileconfig';
 
-	protected $timeFactory;
+    protected $timeFactory;
 
-	/**
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ITimeFactory $timeFactory) {
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ITimeFactory $timeFactory) {
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return self::FILENAME;
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return self::FILENAME;
+    }
 
 
-	public function setName($name) {
-		throw new Forbidden('Renaming ' . self::FILENAME . ' is forbidden');
-	}
+    public function setName($name) {
+        throw new Forbidden('Renaming ' . self::FILENAME . ' is forbidden');
+    }
 
-	/**
-	 * @return null
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * @return null
+     */
+    public function getLastModified() {
+        return null;
+    }
 
-	/**
-	 * @throws Forbidden
-	 */
-	public function delete() {
-		throw new Forbidden(self::FILENAME . ' may not be deleted.');
-	}
+    /**
+     * @throws Forbidden
+     */
+    public function delete() {
+        throw new Forbidden(self::FILENAME . ' may not be deleted.');
+    }
 
-	/**
-	 * @param array $properties
-	 * @return array
-	 */
-	public function getProperties($properties) {
-		$datetime = $this->timeFactory->getDateTime();
+    /**
+     * @param array $properties
+     * @return array
+     */
+    public function getProperties($properties) {
+        $datetime = $this->timeFactory->getDateTime();
 
-		return [
-			'{DAV:}getcontentlength' => 42,
-			'{DAV:}getlastmodified' => $datetime->format(\DateTimeInterface::RFC2822),
-		];
-	}
+        return [
+            '{DAV:}getcontentlength' => 42,
+            '{DAV:}getlastmodified' => $datetime->format(\DateTimeInterface::RFC2822),
+        ];
+    }
 
-	/**
-	 * @param PropPatch $propPatch
-	 * @throws Forbidden
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		throw new Forbidden(self::FILENAME . '\'s properties may not be altered.');
-	}
+    /**
+     * @param PropPatch $propPatch
+     * @throws Forbidden
+     */
+    public function propPatch(PropPatch $propPatch) {
+        throw new Forbidden(self::FILENAME . '\'s properties may not be altered.');
+    }
 }

themes/example/defaults.php

Spacing +5 added lines, -5 removed lines

@@ -90,8 +90,8 @@ 
 	 * @return string short footer
 	 */
 	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -101,8 +101,8 @@ 
 	 * @return string long footer
 	 */
 	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return string documentation link
 	 */
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/15/go.php?to='.$key;
 	}
 
 

Indentation +104 added lines, -104 removed lines

@@ -20,108 +20,108 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Generate a documentation link for a given key
-	 * @return string documentation link
-	 */
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return '#745bca';
-	}
-
-	/**
-	 * Returns variables to overload defaults from core/css/variables.scss
-	 * @return array
-	 */
-	public function getScssVariables() {
-		return [
-			'color-primary' => '#745bca'
-		];
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Generate a documentation link for a given key
+     * @return string documentation link
+     */
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getColorPrimary() {
+        return '#745bca';
+    }
+
+    /**
+     * Returns variables to overload defaults from core/css/variables.scss
+     * @return array
+     */
+    public function getScssVariables() {
+        return [
+            'color-primary' => '#745bca'
+        ];
+    }
 }

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

Indentation +23 added lines, -23 removed lines

@@ -35,34 +35,34 @@
  * a reload but if the session variable is set we properly redirect to the login page.
  */
 class ReloadExecutionMiddleware extends Middleware {
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(ISession $session, IURLGenerator $urlGenerator) {
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(ISession $session, IURLGenerator $urlGenerator) {
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function beforeController($controller, $methodName) {
-		if ($this->session->exists('clearingExecutionContexts')) {
-			throw new ReloadExecutionException();
-		}
-	}
+    public function beforeController($controller, $methodName) {
+        if ($this->session->exists('clearingExecutionContexts')) {
+            throw new ReloadExecutionException();
+        }
+    }
 
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof ReloadExecutionException) {
-			$this->session->remove('clearingExecutionContexts');
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof ReloadExecutionException) {
+            $this->session->remove('clearingExecutionContexts');
 
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
-				'core.login.showLoginForm',
-				['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
-			));
-		}
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
+                'core.login.showLoginForm',
+                ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
+            ));
+        }
 
-		return parent::afterException($controller, $methodName, $exception);
-	}
+        return parent::afterException($controller, $methodName, $exception);
+    }
 
 
 }

lib/public/Files/SimpleFS/InMemoryFile.php

Indentation +115 added lines, -115 removed lines

@@ -32,119 +32,119 @@
  * @since 16.0.0
  */
 class InMemoryFile implements ISimpleFile {
-	/**
-	 * Holds the file name.
-	 *
-	 * @var string
-	 */
-	private $name;
-
-	/**
-	 * Holds the file contents.
-	 *
-	 * @var string
-	 */
-	private $contents;
-
-	/**
-	 * InMemoryFile constructor.
-	 *
-	 * @param string $name The file name
-	 * @param string $contents The file contents
-	 * @since 16.0.0
-	 */
-	public function __construct(string $name, string $contents) {
-		$this->name = $name;
-		$this->contents = $contents;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getSize() {
-		return strlen($this->contents);
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getETag() {
-		return '';
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getMTime() {
-		return time();
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getContent() {
-		return $this->contents;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function putContent($data) {
-		$this->contents = $data;
-	}
-
-	/**
-	 * In memory files can't be deleted.
-	 *
-	 * @since 16.0.0
-	 */
-	public function delete() {
-		// unimplemented for in memory files
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getMimeType() {
-		$fileInfo = new \finfo(FILEINFO_MIME_TYPE);
-		return $fileInfo->buffer($this->contents);
-	}
-
-	/**
-	 * Stream reading is unsupported for in memory files.
-	 *
-	 * @throws NotPermittedException
-	 * @since 16.0.0
-	 */
-	public function read() {
-		throw new NotPermittedException(
-			'Stream reading is unsupported for in memory files'
-		);
-	}
-
-	/**
-	 * Stream writing isn't available for in memory files.
-	 *
-	 * @throws NotPermittedException
-	 * @since 16.0.0
-	 */
-	public function write() {
-		throw new NotPermittedException(
-			'Stream writing is unsupported for in memory files'
-		);
-	}
+    /**
+     * Holds the file name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Holds the file contents.
+     *
+     * @var string
+     */
+    private $contents;
+
+    /**
+     * InMemoryFile constructor.
+     *
+     * @param string $name The file name
+     * @param string $contents The file contents
+     * @since 16.0.0
+     */
+    public function __construct(string $name, string $contents) {
+        $this->name = $name;
+        $this->contents = $contents;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getSize() {
+        return strlen($this->contents);
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getETag() {
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getMTime() {
+        return time();
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getContent() {
+        return $this->contents;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function putContent($data) {
+        $this->contents = $data;
+    }
+
+    /**
+     * In memory files can't be deleted.
+     *
+     * @since 16.0.0
+     */
+    public function delete() {
+        // unimplemented for in memory files
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getMimeType() {
+        $fileInfo = new \finfo(FILEINFO_MIME_TYPE);
+        return $fileInfo->buffer($this->contents);
+    }
+
+    /**
+     * Stream reading is unsupported for in memory files.
+     *
+     * @throws NotPermittedException
+     * @since 16.0.0
+     */
+    public function read() {
+        throw new NotPermittedException(
+            'Stream reading is unsupported for in memory files'
+        );
+    }
+
+    /**
+     * Stream writing isn't available for in memory files.
+     *
+     * @throws NotPermittedException
+     * @since 16.0.0
+     */
+    public function write() {
+        throw new NotPermittedException(
+            'Stream writing is unsupported for in memory files'
+        );
+    }
 }

lib/public/IAvatarManager.php

Indentation +18 added lines, -18 removed lines

@@ -34,24 +34,24 @@
 
 interface IAvatarManager {
 
-	/**
-	 * return a user specific instance of \OCP\IAvatar
-	 * @see IAvatar
-	 * @param string $user the ownCloud user id
-	 * @return IAvatar
-	 * @throws \Exception In case the username is potentially dangerous
-	 * @throws \OCP\Files\NotFoundException In case there is no user folder yet
-	 * @since 6.0.0
-	 */
-	public function getAvatar(string $user) : IAvatar;
+    /**
+     * return a user specific instance of \OCP\IAvatar
+     * @see IAvatar
+     * @param string $user the ownCloud user id
+     * @return IAvatar
+     * @throws \Exception In case the username is potentially dangerous
+     * @throws \OCP\Files\NotFoundException In case there is no user folder yet
+     * @since 6.0.0
+     */
+    public function getAvatar(string $user) : IAvatar;
 
-	/**
-	 * Returns a guest user avatar instance.
-	 *
-	 * @param string $name The guest name, e.g. "Albert".
-	 * @return IAvatar
-	 * @since 16.0.0
-	 */
-	public function getGuestAvatar(string $name): IAvatar;
+    /**
+     * Returns a guest user avatar instance.
+     *
+     * @param string $name The guest name, e.g. "Albert".
+     * @return IAvatar
+     * @since 16.0.0
+     */
+    public function getGuestAvatar(string $name): IAvatar;
 
 }

core/Controller/GuestAvatarController.php

Indentation +64 added lines, -64 removed lines

@@ -33,75 +33,75 @@
  */
 class GuestAvatarController extends Controller {
 
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
+    /**
+     * @var ILogger
+     */
+    private $logger;
 
-	/**
-	 * @var IAvatarManager
-	 */
-	private $avatarManager;
+    /**
+     * @var IAvatarManager
+     */
+    private $avatarManager;
 
-	/**
-	 * GuestAvatarController constructor.
-	 *
-	 * @param $appName
-	 * @param IRequest $request
-	 * @param IAvatarManager $avatarManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IAvatarManager $avatarManager,
-		ILogger $logger
-	) {
-		parent::__construct($appName, $request);
-		$this->avatarManager = $avatarManager;
-		$this->logger = $logger;
-	}
+    /**
+     * GuestAvatarController constructor.
+     *
+     * @param $appName
+     * @param IRequest $request
+     * @param IAvatarManager $avatarManager
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IAvatarManager $avatarManager,
+        ILogger $logger
+    ) {
+        parent::__construct($appName, $request);
+        $this->avatarManager = $avatarManager;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Returns a guest avatar image response.
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $guestName The guest name, e.g. "Albert"
-	 * @param string $size The desired avatar size, e.g. 64 for 64x64px
-	 * @return FileDisplayResponse|Http\Response
-	 */
-	public function getAvatar($guestName, $size) {
-		$size = (int) $size;
+    /**
+     * Returns a guest avatar image response.
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $guestName The guest name, e.g. "Albert"
+     * @param string $size The desired avatar size, e.g. 64 for 64x64px
+     * @return FileDisplayResponse|Http\Response
+     */
+    public function getAvatar($guestName, $size) {
+        $size = (int) $size;
 
-		// min/max size
-		if ($size > 2048) {
-			$size = 2048;
-		} elseif ($size <= 0) {
-			$size = 64;
-		}
+        // min/max size
+        if ($size > 2048) {
+            $size = 2048;
+        } elseif ($size <= 0) {
+            $size = 64;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getGuestAvatar($guestName);
-			$avatarFile = $avatar->getFile($size);
+        try {
+            $avatar = $this->avatarManager->getGuestAvatar($guestName);
+            $avatarFile = $avatar->getFile($size);
 
-			$resp = new FileDisplayResponse(
-				$avatarFile,
-				$avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
-				['Content-Type' => $avatarFile->getMimeType()]
-			);
-		} catch (\Exception $e) {
-			$this->logger->error('error while creating guest avatar', [
-				'err' => $e,
-			]);
-			$resp = new Http\Response();
-			$resp->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
-			return $resp;
-		}
+            $resp = new FileDisplayResponse(
+                $avatarFile,
+                $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
+                ['Content-Type' => $avatarFile->getMimeType()]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error('error while creating guest avatar', [
+                'err' => $e,
+            ]);
+            $resp = new Http\Response();
+            $resp->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
+            return $resp;
+        }
 
-		// Cache for 30 minutes
-		$resp->cacheFor(1800);
-		return $resp;
-	}
+        // Cache for 30 minutes
+        $resp->cacheFor(1800);
+        return $resp;
+    }
 }

lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 			return;
 		}
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
+		$folders = array_filter($folders, function(ISimpleFolder $folder) {
 			return $folder->fileExists('photo.');
 		});
 
@@ -75,7 +75,7 @@ 
 			return;
 		}
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+		$output->info('Delete '.count($folders).' "photo." files');
 
 		foreach ($folders as $folder) {
 			try {
@@ -83,7 +83,7 @@ 
 				$folder->getFile('photo.')->delete();
 			} catch (\Exception $e) {
 				$this->logger->logException($e);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+				$output->warning('Could not delete file "dav-photocache/'.$folder->getName().'/photo."');
 			}
 		}
 	}

Indentation +63 added lines, -63 removed lines

@@ -47,67 +47,67 @@
  */
 class CleanupCardDAVPhotoCache implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppData */
-	private $appData;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(IConfig $config, IAppData $appData, ILogger $logger) {
-		$this->config = $config;
-		$this->appData = $appData;
-		$this->logger = $logger;
-	}
-
-	public function getName(): string {
-		return 'Cleanup invalid photocache files for carddav';
-	}
-
-	private function repair(IOutput $output): void {
-		try {
-			$folders = $this->appData->getDirectoryListing();
-		} catch (NotFoundException $e) {
-			return;
-		} catch (RuntimeException $e) {
-			$this->logger->logException($e, ['message' => 'Failed to fetch directory listing in CleanupCardDAVPhotoCache']);
-			return;
-		}
-
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
-			return $folder->fileExists('photo.');
-		});
-
-		if (empty($folders)) {
-			return;
-		}
-
-		$output->info('Delete ' . count($folders) . ' "photo." files');
-
-		foreach ($folders as $folder) {
-			try {
-				/** @var ISimpleFolder $folder */
-				$folder->getFile('photo.')->delete();
-			} catch (\Exception $e) {
-				$this->logger->logException($e);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
-			}
-		}
-	}
-
-	private function shouldRun(): bool {
-		return version_compare(
-			$this->config->getSystemValue('version', '0.0.0.0'),
-			'16.0.0.0',
-			'<='
-		);
-	}
-
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->repair($output);
-		}
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var IAppData */
+    private $appData;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(IConfig $config, IAppData $appData, ILogger $logger) {
+        $this->config = $config;
+        $this->appData = $appData;
+        $this->logger = $logger;
+    }
+
+    public function getName(): string {
+        return 'Cleanup invalid photocache files for carddav';
+    }
+
+    private function repair(IOutput $output): void {
+        try {
+            $folders = $this->appData->getDirectoryListing();
+        } catch (NotFoundException $e) {
+            return;
+        } catch (RuntimeException $e) {
+            $this->logger->logException($e, ['message' => 'Failed to fetch directory listing in CleanupCardDAVPhotoCache']);
+            return;
+        }
+
+        $folders = array_filter($folders, function (ISimpleFolder $folder) {
+            return $folder->fileExists('photo.');
+        });
+
+        if (empty($folders)) {
+            return;
+        }
+
+        $output->info('Delete ' . count($folders) . ' "photo." files');
+
+        foreach ($folders as $folder) {
+            try {
+                /** @var ISimpleFolder $folder */
+                $folder->getFile('photo.')->delete();
+            } catch (\Exception $e) {
+                $this->logger->logException($e);
+                $output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+            }
+        }
+    }
+
+    private function shouldRun(): bool {
+        return version_compare(
+            $this->config->getSystemValue('version', '0.0.0.0'),
+            '16.0.0.0',
+            '<='
+        );
+    }
+
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->repair($output);
+        }
+    }
 }