nextcloud / server

apps/files_trashbin/lib/Trashbin.php

Spacing +78 added lines, -78 removed lines

@@ -89,7 +89,7 @@ 
 		Filesystem::initMountPoints($uid);
 		if ($uid !== OC_User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/' . $uid . '/files');
+			$ownerView = new View('/'.$uid.'/files');
 			try {
 				$filename = $ownerView->getPath($info['fileid']);
 			} catch (NotFoundException $e) {
@@ -114,8 +114,8 @@ 
 		$array = [];
 		while ($row = $result->fetch()) {
 			$array[$row['id']][$row['timestamp']] = [
-				'location' => (string)$row['location'],
-				'deletedBy' => (string)$row['deleted_by'],
+				'location' => (string) $row['location'],
+				'deletedBy' => (string) $row['deleted_by'],
 			];
 		}
 		$result->closeCursor();
@@ -151,7 +151,7 @@ 
 
 	/** @param string $user */
 	private static function setUpTrash($user): void {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		if (!$view->is_dir('files_trashbin')) {
 			$view->mkdir('files_trashbin');
 		}
@@ -186,8 +186,8 @@ 
 
 		$view = new View('/');
 
-		$target = $user . '/files_trashbin/files/' . static::getTrashFilename($targetFilename, $timestamp);
-		$source = $owner . '/files_trashbin/files/' . static::getTrashFilename($sourceFilename, $timestamp);
+		$target = $user.'/files_trashbin/files/'.static::getTrashFilename($targetFilename, $timestamp);
+		$source = $owner.'/files_trashbin/files/'.static::getTrashFilename($sourceFilename, $timestamp);
 		$free = $view->free_space($target);
 		$isUnknownOrUnlimitedFreeSpace = $free < 0;
 		$isEnoughFreeSpaceLeft = $view->filesize($source) < $free;
@@ -232,14 +232,14 @@ 
 			$ownerPath = $file_path;
 		}
 
-		$ownerView = new View('/' . $owner);
+		$ownerView = new View('/'.$owner);
 
 		// file has been deleted in between
 		if (is_null($ownerPath) || $ownerPath === '') {
 			return true;
 		}
 
-		$sourceInfo = $ownerView->getFileInfo('/files/' . $ownerPath);
+		$sourceInfo = $ownerView->getFileInfo('/files/'.$ownerPath);
 
 		if ($sourceInfo === false) {
 			return true;
@@ -262,7 +262,7 @@ 
 		$lockingProvider = Server::get(ILockingProvider::class);
 
 		// disable proxy to prevent recursive calls
-		$trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
+		$trashPath = '/files_trashbin/files/'.static::getTrashFilename($filename, $timestamp);
 		$gotLock = false;
 
 		do {
@@ -277,7 +277,7 @@ 
 
 				$timestamp = $timestamp + 1;
 
-				$trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
+				$trashPath = '/files_trashbin/files/'.static::getTrashFilename($filename, $timestamp);
 			}
 		} while (!$gotLock);
 
@@ -306,7 +306,7 @@ 
 			if ($trashStorage->file_exists($trashInternalPath)) {
 				$trashStorage->unlink($trashInternalPath);
 			}
-			Server::get(LoggerInterface::class)->error('Couldn\'t move ' . $file_path . ' to the trash bin', ['app' => 'files_trashbin']);
+			Server::get(LoggerInterface::class)->error('Couldn\'t move '.$file_path.' to the trash bin', ['app' => 'files_trashbin']);
 		}
 
 		if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
@@ -360,7 +360,7 @@ 
 		return $moveSuccessful;
 	}
 
-	private static function getConfiguredTrashbinSize(string $user): int|float {
+	private static function getConfiguredTrashbinSize(string $user): int | float {
 		$config = Server::get(IConfig::class);
 		$userTrashbinSize = $config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
 		if (is_numeric($userTrashbinSize) && ($userTrashbinSize > -1)) {
@@ -386,17 +386,17 @@ 
 			$user = OC_User::getUser();
 			$rootView = new View('/');
 
-			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+			if ($rootView->is_dir($owner.'/files_versions/'.$ownerPath)) {
 				if ($owner !== $user) {
-					self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
+					self::copy_recursive($owner.'/files_versions/'.$ownerPath, $owner.'/files_trashbin/versions/'.static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
 				}
-				self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . static::getTrashFilename($filename, $timestamp));
+				self::move($rootView, $owner.'/files_versions/'.$ownerPath, $user.'/files_trashbin/versions/'.static::getTrashFilename($filename, $timestamp));
 			} elseif ($versions = Storage::getVersions($owner, $ownerPath)) {
 				foreach ($versions as $v) {
 					if ($owner !== $user) {
-						self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . static::getTrashFilename($v['name'] . '.v' . $v['version'], $timestamp));
+						self::copy($rootView, $owner.'/files_versions'.$v['path'].'.v'.$v['version'], $owner.'/files_trashbin/versions/'.static::getTrashFilename($v['name'].'.v'.$v['version'], $timestamp));
 					}
-					self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v['version'], $timestamp));
+					self::move($rootView, $owner.'/files_versions'.$v['path'].'.v'.$v['version'], $user.'/files_trashbin/versions/'.static::getTrashFilename($filename.'.v'.$v['version'], $timestamp));
 				}
 			}
 		}
@@ -461,18 +461,18 @@ 
 		if (!$user) {
 			throw new \Exception('Tried to restore a file while not logged in');
 		}
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 
 		$location = '';
 		if ($timestamp) {
 			$location = self::getLocation($user, $filename, $timestamp);
 			if ($location === false) {
-				Server::get(LoggerInterface::class)->error('trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', ['app' => 'files_trashbin']);
+				Server::get(LoggerInterface::class)->error('trash bin database inconsistent! ($user: '.$user.' $filename: '.$filename.', $timestamp: '.$timestamp.')', ['app' => 'files_trashbin']);
 			} else {
 				// if location no longer exists, restore file in the root directory
 				if ($location !== '/'
-					&& (!$view->is_dir('files/' . $location)
-						|| !$view->isCreatable('files/' . $location))
+					&& (!$view->is_dir('files/'.$location)
+						|| !$view->isCreatable('files/'.$location))
 				) {
 					$location = '';
 				}
@@ -482,8 +482,8 @@ 
 		// we need a  extension in case a file/dir with the same name already exists
 		$uniqueFilename = self::getUniqueFilename($location, $filename, $view);
 
-		$source = Filesystem::normalizePath('files_trashbin/files/' . $file);
-		$target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
+		$source = Filesystem::normalizePath('files_trashbin/files/'.$file);
+		$target = Filesystem::normalizePath('files/'.$location.'/'.$uniqueFilename);
 		if (!$view->file_exists($source)) {
 			return false;
 		}
@@ -495,7 +495,7 @@ 
 		}
 
 		$sourcePath = Filesystem::normalizePath($file);
-		$targetPath = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+		$targetPath = Filesystem::normalizePath('/'.$location.'/'.$uniqueFilename);
 
 		$sourceNode = self::getNodeForPath($user, $sourcePath);
 		$targetNode = self::getNodeForPath($user, $targetPath, 'files');
@@ -513,8 +513,8 @@ 
 		// handle the restore result
 		if ($restoreResult) {
 			$fakeRoot = $view->getRoot();
-			$view->chroot('/' . $user . '/files');
-			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
+			$view->chroot('/'.$user.'/files');
+			$view->touch('/'.$location.'/'.$uniqueFilename, $mtime);
 			$view->chroot($fakeRoot);
 			Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);
 
@@ -557,7 +557,7 @@ 
 			$user = OC_User::getUser();
 			$rootView = new View('/');
 
-			$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+			$target = Filesystem::normalizePath('/'.$location.'/'.$uniqueFilename);
 
 			[$owner, $ownerPath] = self::getUidAndFilename($target);
 
@@ -572,14 +572,14 @@ 
 				$versionedFile = $file;
 			}
 
-			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
-				$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
+			if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+				$rootView->rename(Filesystem::normalizePath($user.'/files_trashbin/versions/'.$file), Filesystem::normalizePath($owner.'/files_versions/'.$ownerPath));
 			} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$rootView->rename($user . '/files_trashbin/versions/' . static::getTrashFilename($versionedFile . '.v' . $v, $timestamp), $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+						$rootView->rename($user.'/files_trashbin/versions/'.static::getTrashFilename($versionedFile.'.v'.$v, $timestamp), $owner.'/files_versions/'.$ownerPath.'.v'.$v);
 					} else {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+						$rootView->rename($user.'/files_trashbin/versions/'.$versionedFile.'.v'.$v, $owner.'/files_versions/'.$ownerPath.'.v'.$v);
 					}
 				}
 			}
@@ -592,7 +592,7 @@ 
 	public static function deleteAll() {
 		$user = OC_User::getUser();
 		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfos = $view->getDirectoryContent('files_trashbin/files');
 
 		try {
@@ -667,7 +667,7 @@ 
 	 */
 	public static function delete($filename, $user, $timestamp = null) {
 		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$size = 0;
 
 		if ($timestamp) {
@@ -686,20 +686,20 @@ 
 		$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
 
 		try {
-			$node = $userRoot->get('/files_trashbin/files/' . $file);
+			$node = $userRoot->get('/files_trashbin/files/'.$file);
 		} catch (NotFoundException $e) {
 			return $size;
 		}
 
 		if ($node instanceof Folder) {
-			$size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
+			$size += self::calculateSize(new View('/'.$user.'/files_trashbin/files/'.$file));
 		} elseif ($node instanceof File) {
-			$size += $view->filesize('/files_trashbin/files/' . $file);
+			$size += $view->filesize('/files_trashbin/files/'.$file);
 		}
 
-		self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
+		self::emitTrashbinPreDelete('/files_trashbin/files/'.$file);
 		$node->delete();
-		self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
+		self::emitTrashbinPostDelete('/files_trashbin/files/'.$file);
 
 		return $size;
 	}
@@ -709,20 +709,20 @@ 
 	 * @param string $filename
 	 * @param ?int $timestamp
 	 */
-	private static function deleteVersions(View $view, $file, $filename, $timestamp, string $user): int|float {
+	private static function deleteVersions(View $view, $file, $filename, $timestamp, string $user): int | float {
 		$size = 0;
 		if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
-			if ($view->is_dir('files_trashbin/versions/' . $file)) {
-				$size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
-				$view->unlink('files_trashbin/versions/' . $file);
+			if ($view->is_dir('files_trashbin/versions/'.$file)) {
+				$size += self::calculateSize(new View('/'.$user.'/files_trashbin/versions/'.$file));
+				$view->unlink('files_trashbin/versions/'.$file);
 			} elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$size += $view->filesize('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
-						$view->unlink('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
+						$size += $view->filesize('/files_trashbin/versions/'.static::getTrashFilename($filename.'.v'.$v, $timestamp));
+						$view->unlink('/files_trashbin/versions/'.static::getTrashFilename($filename.'.v'.$v, $timestamp));
 					} else {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
+						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v);
+						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v);
 					}
 				}
 			}
@@ -739,13 +739,13 @@ 
 	 */
 	public static function file_exists($filename, $timestamp = null) {
 		$user = OC_User::getUser();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 
 		if ($timestamp) {
 			$filename = static::getTrashFilename($filename, $timestamp);
 		}
 
-		$target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
+		$target = Filesystem::normalizePath('files_trashbin/files/'.$filename);
 		return $view->file_exists($target);
 	}
 
@@ -759,7 +759,7 @@ 
 		$query = Server::get(IDBConnection::class)->getQueryBuilder();
 		$query->delete('files_trash')
 			->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
-		return (bool)$query->executeStatement();
+		return (bool) $query->executeStatement();
 	}
 
 	/**
@@ -769,7 +769,7 @@ 
 	 * @param string $user
 	 * @return int|float available free space for trash bin
 	 */
-	private static function calculateFreeSpace(int|float $trashbinSize, string $user): int|float {
+	private static function calculateFreeSpace(int | float $trashbinSize, string $user): int | float {
 		$configuredTrashbinSize = static::getConfiguredTrashbinSize($user);
 		if ($configuredTrashbinSize > -1) {
 			return $configuredTrashbinSize - $trashbinSize;
@@ -871,7 +871,7 @@ 
 	 * @param int|float $availableSpace available disc space
 	 * @return int|float size of deleted files
 	 */
-	protected static function deleteFiles(array $files, string $user, int|float $availableSpace): int|float {
+	protected static function deleteFiles(array $files, string $user, int | float $availableSpace): int | float {
 		$expiration = Server::get(Expiration::class);
 		$size = 0;
 
@@ -880,7 +880,7 @@ 
 				if ($availableSpace <= 0 && $expiration->isExpired($file['mtime'], true)) {
 					$tmp = self::delete($file['name'], $user, $file['mtime']);
 					Server::get(LoggerInterface::class)->info(
-						'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
+						'remove "'.$file['name'].'" ('.$tmp.'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
 						[
 							'app' => 'files_trashbin',
 							'user' => $user,
@@ -915,7 +915,7 @@ 
 					$size += self::delete($filename, $user, $timestamp);
 					$count++;
 				} catch (NotPermittedException $e) {
-					Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed for user "{user}"',
+					Server::get(LoggerInterface::class)->warning('Removing "'.$filename.'" from trashbin failed for user "{user}"',
 						[
 							'exception' => $e,
 							'app' => 'files_trashbin',
@@ -924,7 +924,7 @@ 
 					);
 				}
 				Server::get(LoggerInterface::class)->info(
-					'Remove "' . $filename . '" from trashbin for user "{user}" because it exceeds max retention obligation term.',
+					'Remove "'.$filename.'" from trashbin for user "{user}" because it exceeds max retention obligation term.',
 					[
 						'app' => 'files_trashbin',
 						'user' => $user,
@@ -947,22 +947,22 @@ 
 	 * @return int|float
 	 * @throws Exceptions\CopyRecursiveException
 	 */
-	private static function copy_recursive($source, $destination, View $view): int|float {
+	private static function copy_recursive($source, $destination, View $view): int | float {
 		$size = 0;
 		if ($view->is_dir($source)) {
 			$view->mkdir($destination);
 			$view->touch($destination, $view->filemtime($source));
 			foreach ($view->getDirectoryContent($source) as $i) {
-				$pathDir = $source . '/' . $i['name'];
+				$pathDir = $source.'/'.$i['name'];
 				if ($view->is_dir($pathDir)) {
-					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
+					$size += self::copy_recursive($pathDir, $destination.'/'.$i['name'], $view);
 				} else {
 					$size += $view->filesize($pathDir);
-					$result = $view->copy($pathDir, $destination . '/' . $i['name']);
+					$result = $view->copy($pathDir, $destination.'/'.$i['name']);
 					if (!$result) {
 						throw new CopyRecursiveException();
 					}
-					$view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
+					$view->touch($destination.'/'.$i['name'], $view->filemtime($pathDir));
 				}
 			}
 		} else {
@@ -983,17 +983,17 @@ 
 	 * @param int $timestamp timestamp when the file was deleted
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp, string $user): array {
-		$view = new View('/' . $user . '/files_trashbin/versions');
+		$view = new View('/'.$user.'/files_trashbin/versions');
 		$versions = [];
 
 		/** @var \OC\Files\Storage\Storage $storage */
-		[$storage,] = $view->resolvePath('/');
+		[$storage, ] = $view->resolvePath('/');
 
 		$pattern = Server::get(IDBConnection::class)->escapeLikeParameter(basename($filename));
 		if ($timestamp) {
 			// fetch for old versions
-			$escapedTimestamp = Server::get(IDBConnection::class)->escapeLikeParameter((string)$timestamp);
-			$pattern .= '.v%.d' . $escapedTimestamp;
+			$escapedTimestamp = Server::get(IDBConnection::class)->escapeLikeParameter((string) $timestamp);
+			$pattern .= '.v%.d'.$escapedTimestamp;
 			$offset = -strlen($escapedTimestamp) - 2;
 		} else {
 			$pattern .= '.v%';
@@ -1005,7 +1005,7 @@ 
 			Server::get(IDBConnection::class)->getQueryBuilder(),
 			Server::get(IFilesMetadataManager::class),
 		);
-		$normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/' . $filename)), '/');
+		$normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/'.$filename)), '/');
 		$parentId = $cache->getId($normalizedParentPath);
 		if ($parentId === -1) {
 			return [];
@@ -1021,7 +1021,7 @@ 
 		$result->closeCursor();
 
 		/** @var CacheEntry[] $matches */
-		$matches = array_map(function (array $data) {
+		$matches = array_map(function(array $data) {
 			return Cache::cacheEntryFromData($data, Server::get(IMimeTypeLoader::class));
 		}, $entries);
 
@@ -1051,18 +1051,18 @@ 
 		$name = pathinfo($filename, PATHINFO_FILENAME);
 		$l = Util::getL10N('files_trashbin');
 
-		$location = '/' . trim($location, '/');
+		$location = '/'.trim($location, '/');
 
 		// if extension is not empty we set a dot in front of it
 		if ($ext !== '') {
-			$ext = '.' . $ext;
+			$ext = '.'.$ext;
 		}
 
-		if ($view->file_exists('files' . $location . '/' . $filename)) {
+		if ($view->file_exists('files'.$location.'/'.$filename)) {
 			$i = 2;
-			$uniqueName = $name . ' (' . $l->t('restored') . ')' . $ext;
-			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
-				$uniqueName = $name . ' (' . $l->t('restored') . ' ' . $i . ')' . $ext;
+			$uniqueName = $name.' ('.$l->t('restored').')'.$ext;
+			while ($view->file_exists('files'.$location.'/'.$uniqueName)) {
+				$uniqueName = $name.' ('.$l->t('restored').' '.$i.')'.$ext;
 				$i++;
 			}
 
@@ -1078,8 +1078,8 @@ 
 	 * @param View $view file view on the root folder
 	 * @return int|float size of the folder
 	 */
-	private static function calculateSize(View $view): int|float {
-		$root = Server::get(IConfig::class)->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
+	private static function calculateSize(View $view): int | float {
+		$root = Server::get(IConfig::class)->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').$view->getAbsolutePath('');
 		if (!file_exists($root)) {
 			return 0;
 		}
@@ -1109,8 +1109,8 @@ 
 	 * @param string $user user who owns the trash bin
 	 * @return int|float trash bin size
 	 */
-	private static function getTrashbinSize(string $user): int|float {
-		$view = new View('/' . $user);
+	private static function getTrashbinSize(string $user): int | float {
+		$view = new View('/'.$user);
 		$fileInfo = $view->getFileInfo('/files_trashbin');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
@@ -1122,7 +1122,7 @@ 
 	 * @return bool
 	 */
 	public static function isEmpty($user) {
-		$view = new View('/' . $user . '/files_trashbin');
+		$view = new View('/'.$user.'/files_trashbin');
 		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
 			while (($file = readdir($dh)) !== false) {
 				if (!Filesystem::isIgnoredDir($file)) {
@@ -1145,7 +1145,7 @@ 
 	 * Return the filename used in the trash bin
 	 */
 	public static function getTrashFilename(string $filename, int $timestamp): string {
-		$trashFilename = $filename . '.d' . $timestamp;
+		$trashFilename = $filename.'.d'.$timestamp;
 		$length = strlen($trashFilename);
 		// oc_filecache `name` column has a limit of 250 chars
 		$maxLength = 250;
@@ -1173,7 +1173,7 @@ 
 		}
 
 		$view = Server::get(View::class);
-		$fullPath = '/' . $user . '/' . $baseDir . '/' . $path;
+		$fullPath = '/'.$user.'/'.$baseDir.'/'.$path;
 
 		if (Filesystem::is_dir($path)) {
 			return new NonExistingFolder($rootFolder, $view, $fullPath);