1
0
Fork 0
mirror of https://github.com/Yetangitu/owncloud-apps.git synced 2025-10-02 14:49:17 +02:00

Merge pull request #20 from ayamshanov/supportedExtensions_and_folders

Fixed: Folder in OPDS stay be visible when supportedExtensions is con…
This commit is contained in:
Frank de Lange 2016-08-17 14:52:34 +02:00 committed by GitHub
commit d06ed3f898

View file

@ -47,16 +47,18 @@ class Files extends \OCA\Files\Helper
/* if set, add only files with given extensions */ /* if set, add only files with given extensions */
$fileTypes = array_filter(explode(',', strtolower(Config::get('file_types', '')))); $fileTypes = array_filter(explode(',', strtolower(Config::get('file_types', ''))));
$skipList = array_filter(explode(',', strtolower(Config::get('skip_list', 'metadata.opf,cover.jpg')))); $skipList = array_filter(explode(',', strtolower(Config::get('skip_list', 'metadata.opf,cover.jpg'))));
foreach ($fileInfos as $i) { foreach ($fileInfos as $i) {
if((!empty($fileTypes)) && (!in_array(strtolower(substr(strrchr($i->getName(), "."), 1)), $fileTypes))) { if (strcmp($i->getType(), 'dir') !== 0) {
continue; if ((!empty($fileTypes)) && (!in_array(strtolower(substr(strrchr($i->getName(), "."), 1)), $fileTypes))) {
} continue;
if((!empty($skipList)) && (in_array($i->getName(),$skipList))) { }
continue; if ((!empty($skipList)) && (in_array($i->getName(), $skipList))) {
continue;
}
} }
$files[] = self::formatFileInfo($i); $files[] = self::formatFileInfo($i);
} }
return $files; return $files;
} }