allow admin to change retention obligation for the trash bin, default value is 180 days

remotes/origin/stable5
Björn Schießle 12 years ago
parent 16d7716dee
commit b694f996d9
  1. 7
      apps/files_trashbin/lib/trash.php
  2. 3
      config/config.sample.php

@ -24,8 +24,7 @@ namespace OCA_Trash;
class Trashbin {
const DELETEAFTER=30; // how long do we keep files in the trash bin (number of days)
const DEFAULT_RETENTION_OBLIGATION=180; // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
/**
* move file to the trash bin
*
@ -148,7 +147,9 @@ class Trashbin {
$query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?');
$result = $query->execute(array($user))->fetchAll();
$limit = time() - (self::DELETEAFTER * 86400);
$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION);
$limit = time() - ($retention_obligation * 86400);
foreach ( $result as $r ) {
$timestamp = $r['timestamp'];

@ -86,6 +86,9 @@ $CONFIG = array(
/* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
"mail_smtppassword" => "",
/* how long should ownCloud keep delteted files in the trash bin, default value: 180 days */
'trashbin_retention_obligation' => 180,
/* Check 3rdparty apps for malicious code fragments */
"appcodechecker" => "",

Loading…
Cancel
Save