wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reuse delete() function in expire()

Browse source
This commit is contained in:
Björn Schießle 2013-02-20 18:00:15 +01:00
parent 4b5a662e09
commit 5ce6d1fb57
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/files_trashbin/lib/trash.php
View file

@ -322,27 +322,10 @@ class Trashbin {
$timestamp = $r['timestamp'];
$filename = $r['id'];
if ( $r['timestamp'] < $limit ) {
if ($view->is_dir('files_trashbin/files/'.$filename.'.d'.$timestamp)) {
$size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/files/'.$filename.'.d'.$timestamp));
} else {
$size += $view->filesize('files_trashbin/files/'.$filename.'.d'.$timestamp);
}
$view->unlink('files_trashbin/files/'.$filename.'.d'.$timestamp);
if ($r['type'] == 'dir') {
$size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/versions'.$filename.'.d'.$timestamp));
$view->unlink('files_trashbin/versions'.$filename.'.d'.$timestamp);
} else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) {
foreach ($versions as $v) {
$size += $view->filesize('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
$view->unlink('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
}
}
$size += self::delete($filename, $timestamp);
}
}
$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND timestamp<?');
$query->execute(array($user,$limit));
$availableSpace = $availableSpace + $size;
// if size limit for trash bin reached, delete oldest files in trash bin
if ($availableSpace < 0) {
@ -355,8 +338,7 @@ class Trashbin {
$availableSpace += $tmp;
$size += $tmp;
$i++;
}
}
}
return $size;