From b4b648401b25e7efa4c272449151bf3cd790d100 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Mon, 19 Jul 2021 09:04:52 +0200 Subject: [PATCH] GLPI 319342 --- app/Http/Controllers/MediaController.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 9cfd529..1b75c97 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -7,6 +7,7 @@ use Elasticquent\ElasticquentTrait; use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Str; use App\Models\Sujet; use App\Models\Setting; use App\Models\Format; @@ -1180,11 +1181,11 @@ class MediaController extends Controller if (!file_exists($fp)) abort(404, 'Fichier inconnu.'); - + $dlFileName = Str::slug($media->libelle); if ($format === 'original') { - return response()->download($fp, str_replace(' ', '_', $media->libelle)."_original_". $media->largeur ."x". $media->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION))->deleteFileAfterSend($deleteFileAfterSend); + return response()->download($fp, str_replace(' ', '_', $dlFileName)."_original_". $media->largeur ."x". $media->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION))->deleteFileAfterSend($deleteFileAfterSend); }else{ - return response()->download($fp, str_replace(' ', '_', $media->libelle)."_". $format->libelle ."_". $format->largeur ."x". $format->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION))->deleteFileAfterSend($deleteFileAfterSend); + return response()->download($fp, str_replace(' ', '_', $dlFileName)."_". $format->libelle ."_". $format->largeur ."x". $format->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION))->deleteFileAfterSend($deleteFileAfterSend); } } } else { @@ -1208,11 +1209,11 @@ class MediaController extends Controller unlink($zip_file); abort(404, 'Fichier(s) inconnu(s).'); } - + $dlFileName = Str::slug($media->libelle); if ($format === 'original') { - $zip->addFile($fp, str_replace(' ', '_', $media->libelle)."_original_". $media->largeur ."x". $media->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION)); + $zip->addFile($fp, str_replace(' ', '_', $dlFileName)."_original_". $media->largeur ."x". $media->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION)); }else{ - $zip->addFile($fp, str_replace(' ', '_', $media->libelle)."_". $format->libelle ."_". $format->largeur ."x". $format->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION)); + $zip->addFile($fp, str_replace(' ', '_', $dlFileName)."_". $format->libelle ."_". $format->largeur ."x". $format->hauteur ."px.".pathinfo($fp, PATHINFO_EXTENSION)); } } }