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

some final code clean-up

Browse source
This commit is contained in:
Björn Schießle 2013-02-25 14:12:56 +01:00
parent 7ebbecd81f
commit 7da97550df
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,8 +56,9 @@ class Trashbin {
} else {
$type = 'file';
}
if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
$trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size');
if ( $trashbinSize === null ) {
$trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
}
$trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
@ -133,7 +134,8 @@ class Trashbin {
$user = \OCP\User::getUser();
$view = new \OC_FilesystemView('/'.$user);
if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
$trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size');
if ( $trashbinSize === null ) {
$trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
}
if ( $timestamp ) {
@ -242,7 +244,8 @@ class Trashbin {
$view = new \OC_FilesystemView('/'.$user);
$size = 0;
if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
$trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size');
if ( $trashbinSize === null ) {
$trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
}