diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-08-30 01:41:59 -0700 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-08-30 01:41:59 -0700 |
| commit | d6eaa8eaf6f8108b0b4558229b04415e62586d2a (patch) | |
| tree | 293e270ef727ca1bfe61e02f6497ffb43bbf022e | |
| parent | f49e28e4a6ec515ff4d965cf8ad7821e7258406e (diff) | |
| parent | de8687f9f11d49d36b322af72f644f7c5a232b9f (diff) | |
Merge pull request #111 from dpc22/temp_dir_ttl
Add temp_dir_ttl configuration option
| -rw-r--r-- | config/defaults.inc.php | 4 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/config/defaults.inc.php b/config/defaults.inc.php index 54d0b1d27..512455275 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -257,6 +257,10 @@ $config['log_dir'] = 'logs/'; // use this folder to store temp files (must be writeable for apache user) $config['temp_dir'] = 'temp/'; +// expire files in temp_dir after 48 hours +// possible units: s, m, h, d, w +$config['temp_dir_ttl'] = '48h'; + // enforce connections over https // with this option enabled, all non-secure connections will be redirected. // set the port for the ssl connection as value of this option if it differs from the default 443 diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index af9c069cf..d9c3dd8b9 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -498,7 +498,14 @@ class rcube public function gc_temp() { $tmp = unslashify($this->config->get('temp_dir')); - $expire = time() - 172800; // expire in 48 hours + + // expire in 48 hours by default + $temp_dir_ttl = $this->config->get('temp_dir_ttl', '48h'); + $temp_dir_ttl = get_offset_sec($temp_dir_ttl); + if ($temp_dir_ttl < 6*3600) + $temp_dir_ttl = 6*3600; // 6 hours sensible lower bound. + + $expire = time() - $temp_dir_ttl; if ($tmp && ($dir = opendir($tmp))) { while (($fname = readdir($dir)) !== false) { |