From d9c67faa39b85d03c80ed7123f0be3196c8b98a7 Mon Sep 17 00:00:00 2001
From: EV-soft <ingenioer@ev-soft.dk>
Date: Thu, 27 May 2021 16:27:00 +0200
Subject: [PATCH] Improve display of folder info (files / size)

---
 tinyfilemanager.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index a183f5c..d4c206a 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -1,6 +1,6 @@
 <?php
 //Default Configuration
-$CONFIG = '{"lang":"en","error_reporting":false,"show_hidden":false,"hide_Cols":false,"calc_folder":false,"theme":"light"}';
+$CONFIG = '{"lang":"en","error_reporting":false,"show_hidden":false,"hide_Cols":false,"calc_folder":true,"theme":"light"}';
 
 /**
  * H3K | Tiny File Manager V2.4.6
@@ -1940,9 +1940,12 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
                 $img = $is_link ? 'icon-link_folder' : 'fa fa-folder-o';
                 $modif_raw = filemtime($path . '/' . $f);
                 $modif = date(FM_DATETIME_FORMAT, $modif_raw);
-                if ($calc_folder) {
-                    $filesize_raw = fm_get_directorysize($path . '/' . $f);
-                    $filesize = fm_get_filesize($filesize_raw);
+                if ($calc_folder==true) {
+                    $arrInfo = fm_get_directorysize($path . '/' . $f);
+                    $dirCount = $arrInfo[1];
+                    $fileSize = $arrInfo[0];
+                    // $filesize_raw = fm_get_directorysize($path . '/' . $f)[1].'/'.fm_get_directorysize($path . '/' . $f)[0];
+                    $filesize = $dirCount. ' files / ' .fm_get_filesize($fileSize);
                 }
                 else {
                     $filesize_raw = "";
@@ -2520,8 +2523,8 @@ function fm_get_directorysize($directory) {
             $count++;
         }
     else if ($file->isDir()) { $dirCount++; }
-    // return [$size, $count, $dirCount];
-    return $size;
+    return [$size, $count, $dirCount];
+    // return $size;
     }
     else return 'Folder'; //  Quick output
 }