From a6a28a635623256ded5623b9abad17479927f295 Mon Sep 17 00:00:00 2001 From: safraja <63454672+safraja@users.noreply.github.com> Date: Mon, 20 Jul 2020 02:09:47 +0200 Subject: [PATCH] Fix sorting by date and size (#387) Based on suggestions in https://github.com/prasathmani/tinyfilemanager/issues/197 but uses data-sort attribute (from DataTable wiki https://datatables.net/examples/advanced_init/html5-data-attributes.html) instead of invisible characters and also distinguishes files and folders, so they stay grouped even after sort. (I am sorry for my bad English.) --- tinyfilemanager.php | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index 3e59f94..896697f 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -1902,7 +1902,16 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white foreach ($folders as $f) { $is_link = is_link($path . '/' . $f); $img = $is_link ? 'icon-link_folder' : 'fa fa-folder-o'; - $modif = date(FM_DATETIME_FORMAT, filemtime($path . '/' . $f)); + $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); + } + else { + $filesize_raw = ""; + $filesize = lng('Folder'); + } $perms = substr(decoct(fileperms($path . '/' . $f)), -4); if (function_exists('posix_getpwuid') && function_exists('posix_getgrgid')) { $owner = posix_getpwuid(fileowner($path . '/' . $f)); @@ -1924,8 +1933,10 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
-