From 32d69b61d80d4f631f28fe5f08bc816c2a22068b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 6 Jul 2016 09:04:15 +0200 Subject: [PATCH] if $showfolders is set, only folders are shown --- views/bootstrap/class.DropFolderChooser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php index e26c9276b..10541e5fc 100644 --- a/views/bootstrap/class.DropFolderChooser.php +++ b/views/bootstrap/class.DropFolderChooser.php @@ -78,15 +78,15 @@ $('.folderselect').click(function(ev) { $finfo = finfo_open(FILEINFO_MIME_TYPE); while (false !== ($entry = $d->read())) { if($entry != '..' && $entry != '.') { - if(!is_dir($dir.'/'.$entry)) { + if($showfolders == 0 && !is_dir($dir.'/'.$entry)) { $mimetype = finfo_file($finfo, $dir.'/'.$entry); $previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype); echo ""; if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) { - echo ""; + echo ""; } echo "".$entry."".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."\n"; - } elseif($showfolders) { + } elseif($showfolders && is_dir($dir.'/'.$entry)) { echo ""; echo ""; echo "".$entry."";