From 7fb607b48c181512b31f52a7ef7e302f331ec18d Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Wed, 5 Dec 2018 18:37:30 +0100 Subject: mediastyle --- app/class/modelmedia.php | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'app/class/modelmedia.php') diff --git a/app/class/modelmedia.php b/app/class/modelmedia.php index a5c48fe..3402a04 100644 --- a/app/class/modelmedia.php +++ b/app/class/modelmedia.php @@ -40,17 +40,20 @@ class Modelmedia extends Model { $fileinfo = pathinfo($entry); - $filepath = $fileinfo['dirname'] . '.' . $fileinfo['extension']; - - $donnees = array( - 'id' => str_replace('.' . $fileinfo['extension'], '', $fileinfo['filename']), - 'path' => $dir, - 'extension' => $fileinfo['extension'] - ); - + if(isset($fileinfo['extension'])) { + $filepath = $fileinfo['dirname'] . '.' . $fileinfo['extension']; + + $datas = array( + 'id' => str_replace('.' . $fileinfo['extension'], '', $fileinfo['filename']), + 'path' => $dir, + 'extension' => $fileinfo['extension'] + ); + return new Media($datas); + } else { + return false; + } - return new Media($donnees); } @@ -63,21 +66,24 @@ class Modelmedia extends Model $media = $this->getmedia($entry, $dir); - - $media->analyse(); - - if (in_array($type, self::MEDIA_TYPES)) { - if ($media->type() == $type) { + if($media != false) { + + $media->analyse(); + + if (in_array($type, self::MEDIA_TYPES)) { + if ($media->type() == $type) { + $list[] = $media; + } + } else { $list[] = $media; } - } else { - $list[] = $media; + } + } } - return $list; } return $list; -- cgit v1.2.3