upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-29 13:53:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

restore filekeys from trash bin

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

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

@ -82,10 +82,11 @@ class Trashbin {
}
}
// Take care of encryption keys
if ( \OCP\App::isEnabled('files_encryption') ) {
$trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path));
$view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp);
// Take care of encryption keys
$keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path.'.key');
if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
$trashbinSize += $view->filesize($keyfile);
$view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp);
}
} else {
@ -187,7 +188,18 @@ class Trashbin {
}
}
}
// Take care of encryption keys
$keyfile = 'files_trashbin/keyfiles/'.$file;
if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
if ( $result[0]['type'] == 'dir' ) {
$trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile));
} else {
$trashbinSize -= $view->filesize($keyfile);
}
$view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key');
}
if ( $timestamp ) {
$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
$query->execute(array($user,$filename,$timestamp));