Merge pull request #24296 from nextcloud/backport/stable19/23023

[stable19] Delete files that exceed trashbin size immediately
nextcloud · Nov 23, 2020 · 5870bd2 · 5870bd2
2 parents 2a7c990 + 1a607b2
commit 5870bd2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
@@ -287,6 +287,14 @@ public static function move2trash($file_path, $ownerOnly = false) {
 			$trashStorage->unlink($trashInternalPath);
 		}
 
+		$config = \OC::$server->getConfig();
+		$systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
+		$userTrashbinSize = (int)$config->getUserValue($owner, 'files_trashbin', 'trashbin_size', '-1');
+		$configuredTrashbinSize = ($userTrashbinSize < 0) ? $systemTrashbinSize : $userTrashbinSize;
+		if ($configuredTrashbinSize >= 0 && $sourceStorage->filesize($sourceInternalPath) >= $configuredTrashbinSize) {
+			return false;
+		}
+
 		$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
 
 		try {