From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 4 Dec 2013 13:20:29 +0000 (+0100)
Subject: config switch to disable auto expire for the trash bin
X-Git-Tag: v7.0.0alpha2~1087^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b7fdda4f5b11c1ec92cd66270c2aa37f7324432;p=nextcloud-server.git

config switch to disable auto expire for the trash bin
---

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 48d43b059fa..567f88b91b1 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -778,8 +778,13 @@ class Trashbin {
 	 */
 	private static function expire($trashbinSize, $user) {
 
+		// let the admin disable auto expire
+		$autoExpire = \OC_Config::getValue('trashbin_auto_expire', true);
+		if ($autoExpire === false) {
+			return 0;
+		}
+
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/' . $user);
 		$availableSpace = self::calculateFreeSpace($trashbinSize);
 		$size = 0;
 
diff --git a/config/config.sample.php b/config/config.sample.php
index 7b533a8b9ce..ba068968323 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -117,6 +117,9 @@ $CONFIG = array(
 /* How long should ownCloud keep deleted files in the trash bin, default value:  30 days */
 'trashbin_retention_obligation' => 30,
 
+/* Disable/Enable auto expire for the trash bin, by default auto expire is enabled */
+'trashbin_auto_expire' => true,
+
 /* allow user to change his display name, if it is supported by the back-end */
 'allow_user_to_change_display_name' => true,
 
@@ -185,8 +188,8 @@ $CONFIG = array(
 // "datadirectory" => "",
 
 /* Enable maintenance mode to disable ownCloud
-   If you want to prevent users to login to ownCloud before you start doing some maintenance work, 
-   you need to set the value of the maintenance parameter to true. 
+   If you want to prevent users to login to ownCloud before you start doing some maintenance work,
+   you need to set the value of the maintenance parameter to true.
    Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly.
 */
 "maintenance" => false,