Delete files that exceed trashbin size immediately

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 276cdf4e2d91a224ec3a3b3c70cdfa8fcd277ec8..b1e1d0600b00616ed25691562054250f839212bc 100644 (file)
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -285,6 +285,14 @@ class Trashbin {
                        $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;
+               }
+
                $connection = \OC::$server->getDatabaseConnection();
                $connection->beginTransaction();
                $trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);