aboutsummaryrefslogtreecommitdiff
path: root/app/class/modelmedia.php
diff options
context:
space:
mode:
authorvincent-peugnet <v.peugnet@free.fr>2018-12-05 18:37:30 +0100
committervincent-peugnet <v.peugnet@free.fr>2018-12-05 18:37:30 +0100
commit7fb607b48c181512b31f52a7ef7e302f331ec18d (patch)
treec4d89cba3c0d01679ed1455e0d7c39fa2fdb824c /app/class/modelmedia.php
parentad3aed389f2e0d69802641f5a5b7c6add73f1ce5 (diff)
downloadwcms-7fb607b48c181512b31f52a7ef7e302f331ec18d.tar.gz
wcms-7fb607b48c181512b31f52a7ef7e302f331ec18d.zip
mediastyle
Diffstat (limited to 'app/class/modelmedia.php')
-rw-r--r--app/class/modelmedia.php40
1 files changed, 23 insertions, 17 deletions
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;