diff --git a/app/Http/Controllers/FileFunctions/EditItemsController.php b/app/Http/Controllers/FileFunctions/EditItemsController.php index 0a0d384c..adb7a684 100644 --- a/app/Http/Controllers/FileFunctions/EditItemsController.php +++ b/app/Http/Controllers/FileFunctions/EditItemsController.php @@ -179,7 +179,7 @@ class EditItemsController extends Controller if ($request->user()->tokenCan('editor')) { // Prevent force delete for non-master users - if ($request->force_delete) abort('401'); + if ($request->input('data.force_delete')) abort('401'); // check if shared_token cookie exist if (!$request->hasCookie('shared_token')) abort('401'); @@ -188,10 +188,10 @@ class EditItemsController extends Controller $shared = get_shared($request->cookie('shared_token')); // Get file|folder item - $item = get_item($request->type, $unique_id, Auth::id()); + $item = get_item($request->input('data.type'), $unique_id, Auth::id()); // Check access to requested directory - if ($request->type === 'folder') { + if ($request->input('data.type') === 'folder') { Guardian::check_item_access($item->unique_id, $shared); } else { Guardian::check_item_access($item->folder_id, $shared); @@ -228,10 +228,10 @@ class EditItemsController extends Controller if (!is_editor($shared)) abort(403); // Get file|folder item - $item = get_item($request->type, $unique_id, $shared->user_id); + $item = get_item($request->input('data.type'), $unique_id, $shared->user_id); // Check access to requested item - if ($request->type === 'folder') { + if ($request->input('data.type') === 'folder') { Guardian::check_item_access($item->unique_id, $shared); } else { Guardian::check_item_access($item->folder_id, $shared); diff --git a/app/Http/Tools/Editor.php b/app/Http/Tools/Editor.php index b7bd2b01..f7456cfa 100644 --- a/app/Http/Tools/Editor.php +++ b/app/Http/Tools/Editor.php @@ -92,7 +92,7 @@ class Editor $user = is_null($shared) ? Auth::user() : User::findOrFail($shared->user_id); // Delete folder - if ($request->type === 'folder') { + if ($request->input('data.type') === 'folder') { // Get folder $folder = FileManagerFolder::withTrashed() @@ -113,7 +113,7 @@ class Editor } // Force delete children files - if ($request->force_delete) { + if ($request->input('data.force_delete')) { // Get children folder ids $child_folders = filter_folders_ids($folder->trashed_folders, 'unique_id'); @@ -142,7 +142,7 @@ class Editor } // Soft delete items - if (!$request->force_delete) { + if (!$request->input('data.force_delete')) { // Remove folder from user favourites $user->favourite_folders()->detach($unique_id); @@ -153,7 +153,7 @@ class Editor } // Delete item - if ($request->type !== 'folder') { + if ($request->input('data.type') !== 'folder') { // Get file $file = FileManagerFile::withTrashed() @@ -173,7 +173,7 @@ class Editor } // Force delete file - if ($request->force_delete) { + if ($request->input('data.force_delete')) { // Delete file Storage::delete('/file-manager/' . $file->basename); @@ -186,7 +186,7 @@ class Editor } // Soft delete file - if (!$request->force_delete) { + if (!$request->input('data.force_delete')) { // Soft delete file $file->delete();