diff --git a/modules/Admin/Controllers/EpisodeController.php b/modules/Admin/Controllers/EpisodeController.php index 3e861715..9ea381bd 100644 --- a/modules/Admin/Controllers/EpisodeController.php +++ b/modules/Admin/Controllers/EpisodeController.php @@ -147,7 +147,7 @@ class EpisodeController extends BaseController 'slug' => 'max_length[128]', 'audio_file' => 'uploaded[audio_file]|ext_in[audio_file,mp3,m4a]', 'cover' => - 'is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', + 'is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', 'transcript_file' => 'ext_in[transcript,srt]|permit_empty', 'chapters_file' => 'ext_in[chapters,json]|permit_empty', @@ -286,7 +286,7 @@ class EpisodeController extends BaseController 'audio_file' => 'uploaded[audio_file]|ext_in[audio_file,mp3,m4a]|permit_empty', 'cover' => - 'is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', + 'is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', 'transcript_file' => 'ext_in[transcript_file,txt,html,srt,json]|permit_empty', 'chapters_file' => 'ext_in[chapters_file,json]|permit_empty', diff --git a/modules/Admin/Controllers/PodcastController.php b/modules/Admin/Controllers/PodcastController.php index 2f57a233..35930b72 100644 --- a/modules/Admin/Controllers/PodcastController.php +++ b/modules/Admin/Controllers/PodcastController.php @@ -184,8 +184,8 @@ class PodcastController extends BaseController { $rules = [ 'cover' => - 'uploaded[cover]|is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', - 'banner' => 'is_image[banner]|ext_in[banner,jpg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]', + 'uploaded[cover]|is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', + 'banner' => 'is_image[banner]|ext_in[banner,jpg,jpeg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]', ]; if (! $this->validate($rules)) { @@ -299,8 +299,8 @@ class PodcastController extends BaseController { $rules = [ 'cover' => - 'is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', - 'banner' => 'is_image[banner]|ext_in[banner,jpg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]', + 'is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', + 'banner' => 'is_image[banner]|ext_in[banner,jpg,jpeg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]', ]; if (! $this->validate($rules)) { diff --git a/modules/Media/FileManagers/FS.php b/modules/Media/FileManagers/FS.php index f37792a7..e2d5ce06 100644 --- a/modules/Media/FileManagers/FS.php +++ b/modules/Media/FileManagers/FS.php @@ -90,7 +90,7 @@ class FS implements FileManagerInterface helper('media'); $allPodcastImagesPaths = []; - foreach (['jpg', 'png', 'webp'] as $ext) { + foreach (['jpg', 'jpeg', 'png', 'webp'] as $ext) { $images = glob(media_path("/podcasts/{$podcastHandle}/*_*{$ext}")); if (! $images) { @@ -114,7 +114,7 @@ class FS implements FileManagerInterface helper('media'); $allPersonsImagesPaths = []; - foreach (['jpg', 'png', 'webp'] as $ext) { + foreach (['jpg', 'jpeg', 'png', 'webp'] as $ext) { $images = glob(media_path("/persons/*_*{$ext}")); if (! $images) { diff --git a/modules/Media/FileManagers/S3.php b/modules/Media/FileManagers/S3.php index 166d8922..4c86ed64 100644 --- a/modules/Media/FileManagers/S3.php +++ b/modules/Media/FileManagers/S3.php @@ -136,7 +136,10 @@ class S3 implements FileManagerInterface $prefixedPodcasts = $this->prefixKey('podcasts'); - array_push($keys, ...preg_grep("~^{$prefixedPodcasts}\/{$podcastHandle}\/.*_.*.\.(jpg|png|webp)$~", $key)); + array_push( + $keys, + ...preg_grep("~^{$prefixedPodcasts}\/{$podcastHandle}\/.*_.*.\.(jpe?g|png|webp)$~", $key) + ); } $objectsToDelete = array_map(static function ($key): array { @@ -178,7 +181,7 @@ class S3 implements FileManagerInterface $prefixedPersons = $this->prefixKey('persons'); - array_push($keys, ...preg_grep("~^{$prefixedPersons}\/.*_.*.\.(jpg|png|webp)$~", $key)); + array_push($keys, ...preg_grep("~^{$prefixedPersons}\/.*_.*.\.(jpe?g|png|webp)$~", $key)); } $objectsToDelete = array_map(static function ($key): array {