Commit ae5e12be authored by Aonrud's avatar Aonrud
Browse files

fix: allow images to have .jpeg extension consistently

parent 208c2715

modules/Admin/Controllers/EpisodeController.php

+2 −2
Original line number Diff line number Diff line
@@ -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',

modules/Admin/Controllers/PodcastController.php

+4 −4
Original line number Diff line number Diff line
@@ -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)) {

modules/Media/FileManagers/FS.php

+2 −2
Original line number Diff line number Diff line
@@ -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) {

modules/Media/FileManagers/S3.php

+5 −2
Original line number Diff line number Diff line
@@ -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 {