Browse Source

config switch to disable auto expire for the trash bin

tags/v7.0.0alpha2
Bjoern Schiessle 10 years ago
parent
commit
6b7fdda4f5
2 changed files with 11 additions and 3 deletions
  1. 6
    1
      apps/files_trashbin/lib/trashbin.php
  2. 5
    2
      config/config.sample.php

+ 6
- 1
apps/files_trashbin/lib/trashbin.php View File

@@ -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;


+ 5
- 2
config/config.sample.php View File

@@ -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,

Loading…
Cancel
Save