DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-12 16:44:08 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update to only use relative paths

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-09-07 20:22:14 +01:00
parent 65a76c599c
commit 894c34ff4f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Users/UserFilesController.php
View file

@ -2,6 +2,7 @@
namespace App\Http\Controllers\Users; namespace App\Http\Controllers\Users;
use App\Helpers\StorageHelper;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\AssetFileRequest; use App\Http\Requests\AssetFileRequest;
use App\Models\Actionlog; use App\Models\Actionlog;
@ -143,17 +144,17 @@ class UserFilesController extends Controller
$this->authorize('view', $user); $this->authorize('view', $user);
$log = Actionlog::find($fileId); $log = Actionlog::find($fileId);
$file = 'private_uploads/users/'.$log->filename;
// Display the file inline // Display the file inline
if (request('inline') == 'true') { if (request('inline') == 'true') {
$headers = [ $headers = [
'Content-Disposition' => 'inline', 'Content-Disposition' => 'inline',
]; ];
return Storage::download($file, $log->filename, $headers); return Storage::download('private_uploads/users/'.$log->filename, $log->filename, $headers);
} }
return Response::download($file); //FIXME this doesn't use the new StorageHelper yet, but it's complicated... return Storage::download('private_uploads/users/'.$log->filename);
} }
// Redirect to the user management page if the user doesn't exist // Redirect to the user management page if the user doesn't exist