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

delete keyfiles if file in trash bin gets deleted permanently

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

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

@ -83,10 +83,14 @@ class Trashbin {
}
// 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);
$keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path);
if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) {
if ( $view->is_dir('files'.$file_path) ) {
$trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile));
} else {
$trashbinSize += $view->filesize($keyfile.'.key');
}
$view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp);
}
} else {
@ -190,7 +194,7 @@ class Trashbin {
}
// Take care of encryption keys
$keyfile = 'files_trashbin/keyfiles/'.$file;
$keyfile = \OC_Filesystem::normalizePath('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));
@ -252,6 +256,17 @@ class Trashbin {
}
}
}
}
// Take care of encryption keys
$keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file);
if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
if ( $result[0]['type'] == 'dir' ) {
$size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile));
} else {
$size += $view->filesize($keyfile);
}
$view->unlink($keyfile);
}
if ($view->is_dir('/files_trashbin/files/'.$file)) {