mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removing deletion of encryption keys 

this will be handled in the wrapper now
This commit is contained in:
Clark Tomlinson 2015-05-07 11:31:34 -04:00
parent a0c6c01137
commit d557519746
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/files_trashbin/lib/trashbin.php
View File

@ -425,7 +425,6 @@ class Trashbin {
}
$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
$size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp, $user);
if ($view->is_dir('/files_trashbin/files/' . $file)) {
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file));
@ -467,31 +466,6 @@ class Trashbin {
return $size;
}
/**
* @param \OC\Files\View $view
* @param $file
* @param $filename
* @param $timestamp
* @return int
*/
private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) {
$size = 0;
if (\OCP\App::isEnabled('encryption')) {
$keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename);
if ($timestamp) {
$keyfiles .= '.d' . $timestamp;
}
if ($view->is_dir($keyfiles)) {
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfiles));
$view->deleteAll($keyfiles);
}
}
return $size;
}
/**
* check to see whether a file exists in trashbin
*