From 26bd6b7d7977bbe6af067bd2ae4f4b11e00d31e8 Mon Sep 17 00:00:00 2001 From: Alexander Yamshanov Date: Mon, 4 Jul 2016 23:28:04 +0600 Subject: [PATCH] Fixed: Folder in OPDS stay be visible when supportedExtensions is configured --- files_opds/lib/files.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/files_opds/lib/files.php b/files_opds/lib/files.php index a689b00..84bc144 100644 --- a/files_opds/lib/files.php +++ b/files_opds/lib/files.php @@ -47,16 +47,18 @@ class Files extends \OCA\Files\Helper /* if set, add only files with given extensions */ $fileTypes = array_filter(explode(',', strtolower(Config::get('file_types', '')))); $skipList = array_filter(explode(',', strtolower(Config::get('skip_list', 'metadata.opf,cover.jpg')))); - foreach ($fileInfos as $i) { - if((!empty($fileTypes)) && (!in_array(strtolower(substr(strrchr($i->getName(), "."), 1)), $fileTypes))) { - continue; - } - if((!empty($skipList)) && (in_array($i->getName(),$skipList))) { - continue; + foreach ($fileInfos as $i) { + if (strcmp($i->getType(), 'dir') !== 0) { + if ((!empty($fileTypes)) && (!in_array(strtolower(substr(strrchr($i->getName(), "."), 1)), $fileTypes))) { + continue; + } + if ((!empty($skipList)) && (in_array($i->getName(), $skipList))) { + continue; + } } - $files[] = self::formatFileInfo($i); - } + $files[] = self::formatFileInfo($i); + } return $files; }