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

Merge pull request #1459 from nextcloud/upstream-fix_trashbin_deleteallhooks_solution2

Browse source 
[Upstream] fix trashbin deleteallhooks solution2
This commit is contained in:
Lukas Reschke 2016-09-27 18:52:14 +02:00 committed by GitHub
commit 2f488ce373
1 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
apps/files_trashbin/lib/Trashbin.php
View file

@ -470,15 +470,58 @@ class Trashbin {
public static function deleteAll() {
$user = User::getUser();
$view = new View('/' . $user);
$fileInfos = $view->getDirectoryContent('files_trashbin/files');
// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
$filePaths = array();
foreach($fileInfos as $fileInfo){
$filePaths[] = $view->getRelativePath($fileInfo->getPath());
}
unset($fileInfos); // save memory
// Bulk PreDelete-Hook
\OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', array('paths' => $filePaths));
// Single-File Hooks
foreach($filePaths as $path){
self::emitTrashbinPreDelete($path);
}
// actual file deletion
$view->deleteAll('files_trashbin');
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
$query->execute(array($user));
// Bulk PostDelete-Hook
\OC_Hook::emit('\OCP\Trashbin', 'deleteAll', array('paths' => $filePaths));
// Single-File Hooks
foreach($filePaths as $path){
self::emitTrashbinPostDelete($path);
}
$view->mkdir('files_trashbin');
$view->mkdir('files_trashbin/files');
return true;
}
/**
* wrapper function to emit the 'preDelete' hook of \OCP\Trashbin before a file is deleted
* @param string $path
*/
protected static function emitTrashbinPreDelete($path){
\OC_Hook::emit('\OCP\Trashbin', 'preDelete', array('path' => $path));
}
/**
* wrapper function to emit the 'delete' hook of \OCP\Trashbin after a file has been deleted
* @param string $path
*/
protected static function emitTrashbinPostDelete($path){
\OC_Hook::emit('\OCP\Trashbin', 'delete', array('path' => $path));
}
/**
* delete file from trash bin permanently
*
@ -507,9 +550,9 @@ class Trashbin {
} else {
$size += $view->filesize('/files_trashbin/files/' . $file);
}
\OC_Hook::emit('\OCP\Trashbin', 'preDelete', array('path' => '/files_trashbin/files/' . $file));
self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
$view->unlink('/files_trashbin/files/' . $file);
\OC_Hook::emit('\OCP\Trashbin', 'delete', array('path' => '/files_trashbin/files/' . $file));
self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
return $size;
}