forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Olivier Legat 2021-07-19 09:05:10 +02:00
commit b46841a024
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/MediaController.php
View file

@ -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));
}
}
}