nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 11:00:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

added it_zip_shared_multiple_files_and_download_it, it_try_zip_non_shared_file_with_shared_multiple_files_and_download_it test

Browse Source
This commit is contained in:
Peter Papp
2021-03-10 10:02:44 +01:00
parent 1045423692
commit 8d85aad601
5 changed files with 135 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/FileAccessController.php
+22 -11
View File
@@ -92,11 +92,17 @@ class FileAccessController extends Controller
*/
public function get_zip($id)
{
$disk = Storage::disk('local');
$zip = Zip::whereId($id)
->where('user_id', Auth::id())
->firstOrFail();
$disk = Storage::disk('local');
$zip
->user
->record_download(
$disk->size("zip/$zip->basename")
);
return $disk->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
@@ -116,21 +122,26 @@ class FileAccessController extends Controller
*/
public function get_zip_public($id, $token)
{
$disk = Storage::disk('local');
$zip = Zip::where('id', $id)
->where('shared_token', $token)
->first();
$zip_path = 'zip/' . $zip->basename;
$zip
->user
->record_download(
$disk->size("zip/$zip->basename")
);
$header = [
"Content-Type" => 'application/zip',
"Content-Length" => Storage::disk('local')->size($zip_path),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . Storage::disk('local')->size($zip_path),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
];
return Storage::disk('local')->download($zip_path, $zip->basename, $header);
return $disk
->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
]);
}
/**
app/Http/Controllers/FileFunctions/EditItemsController.php
+3 -3
View File
@@ -459,7 +459,7 @@ class EditItemsController extends Controller
$shared = get_shared($token);
$file_parent_folders = File::whereUserId($shared->user_id)
->whereIn('id', $request->input('files'))
->whereIn('id', $request->items)
->get()
->pluck('folder_id')
->toArray();
@@ -469,7 +469,7 @@ class EditItemsController extends Controller
// Get requested files
$files = File::whereUserId($shared->user_id)
->whereIn('id', $request->input('files'))
->whereIn('id', $request->items)
->get();
$zip = Editor::zip_files($files, $shared);
@@ -481,7 +481,7 @@ class EditItemsController extends Controller
'token' => $shared->token,
]),
'name' => $zip->basename,
], 200);
], 201);
}
/**