fixed files list

Author: shamsbd71

src/Plugins/Core.php

@@ -17,17 +17,20 @@ public function list()
         $dirs = fm_finder()->depth(0)->directories()->in(fm_request_path());
         $files = fm_finder()->depth(0)->files()->in(fm_request_path());
 
+        // check if there are any search results
         $list = [
             'dirs' => [],
             'files' => [],
         ];
+
         /** @var SplFileInfo $dir */
         foreach ($dirs as $dir) {
             $list['dirs'][] = fm_getFileInfo($dir);
         }
+
         /** @var SplFileInfo $file */
         foreach ($files as $file) {
-            $list['files'][] = fm_getFileInfo($file);
+            $list['files'][] = fm_getFileInfo($file, 'files');
         }
         $filtered_list = fm_apply_filter('core@list', $list);
 

src/config.php

@@ -10,6 +10,6 @@
     ],
     'plugins' => [
         'core' => \ThemeXpert\FileManager\Plugins\Core::class,
-        'pjpeg' => \ThemeXpert\FileManager\Plugins\ProgressiveJPEG::class,
+        // 'pjpeg' => \ThemeXpert\FileManager\Plugins\ProgressiveJPEG::class,
     ]
 ];

src/helpers.php

@@ -69,10 +69,13 @@ function fm_add_filter($hook, $callable)
 function fm_apply_filter($hook, $value)
 {
     global $filters;
+    if($filters && $filters[$hook] !== null){
+        return array_reduce($filters[$hook], function ($value, $filter) {
+            return $filter($value);
+        }, $value);
+    }
 
-    return array_reduce($filters[$hook], function ($value, $filter) {
-        return $filter($value);
-    }, $value);
+    return $value;
 }
 
 /**
@@ -388,11 +391,12 @@ function fm_abort($code, $data = ['message' => 'Aborted'])
 
 /**
  * @param  \Symfony\Component\Finder\SplFileInfo  $file
+ * @param  string  $type
  *
  * @return array
  * @since 1.0.0
  */
-function fm_getFileInfo(\Symfony\Component\Finder\SplFileInfo $file)
+function fm_getFileInfo(\Symfony\Component\Finder\SplFileInfo $file, $type = 'dirs')
 {
     $path = fm_request('path');
 
@@ -412,7 +416,12 @@ function fm_getFileInfo(\Symfony\Component\Finder\SplFileInfo $file)
         'extra'         => [],
     ];
 
-    if ($file->isFile()) {
+    /**
+     * previously was $file->isFile()
+     * now added as params
+     * @since 1.3.0
+     */
+    if ($type === 'files') {
         $mime = fm_mimeTypes()->guessMimeType($file->getRealPath());
         if (preg_match('#^image/#', $mime)) {
             $dimension = getimagesize($file->getRealPath());