added it_rename_file, it_move_file_to_another_folder, it_delete_multiple_files_softly

This commit is contained in:
Peter Papp
2021-02-27 11:17:04 +01:00
parent 97ade6c238
commit 3328fdebb0
4 changed files with 141 additions and 67 deletions
@@ -188,13 +188,13 @@ class EditItemsController extends Controller
return Demo::response_204();
}
foreach ($request->input('items') as $file) {
foreach ($request->input('items') as $item) {
// Check permission to delete item for authenticated editor
if ($request->user()->tokenCan('editor')) {
// Prevent force delete for non-master users
if ($file['force_delete']) abort('401');
if ($item['force_delete']) abort('401');
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -203,10 +203,10 @@ class EditItemsController extends Controller
$shared = get_shared($request->cookie('shared_token'));
// Get file|folder item
$item = get_item($file['type'], $file['id']);
$item = get_item($item['type'], $item['id']);
// Check access to requested directory
if ($file['type'] === 'folder') {
if ($item['type'] === 'folder') {
Guardian::check_item_access($item->id, $shared);
} else {
Guardian::check_item_access($item->folder_id, $shared);
@@ -214,7 +214,7 @@ class EditItemsController extends Controller
}
// Delete item
Editor::delete_item($file, $file['id']);
Editor::delete_item($item, $item['id']);
}
return response(null, 204);
+7 -10
View File
@@ -337,18 +337,15 @@ class Editor
}
// Delete item
if ($item['type'] !== 'folder') {
if ($item['type'] === 'file') {
// Get file
$item = File::withTrashed()
->where('user_id', $user->id)
->where('unique_id', $unique_id)
->first();
$item = UserFile::withTrashed()
->find($id);
// Get folder shared record
$shared = Share::where('user_id', $user->id)
->where('type', '=', 'file')
->where('item_id', $unique_id)
$shared = Share::where('type', 'file')
->where('item_id', $id)
->first();
// Delete file shared record
@@ -357,7 +354,7 @@ class Editor
}
// Force delete file
if ($file['force_delete']) {
if ($item['force_delete']) {
// Delete file
Storage::delete('/file-manager/' . $item->basename);
@@ -370,7 +367,7 @@ class Editor
}
// Soft delete file
if (!$file['force_delete']) {
if (!$item['force_delete']) {
// Soft delete file
$item->delete();