From ef7dbb1f77a05a52be0eabae33a4d3718ebb5068 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Fri, 29 Sep 2023 00:21:50 +0300 Subject: [PATCH 1/2] Fix to support hiding dot-files in File Manager --- filemin/config.cgi | 3 ++- filemin/config.info | 3 ++- filemin/defaultuconf | 3 ++- filemin/index.cgi | 3 ++- filemin/lang/en | 1 + filemin/save_config.cgi | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/filemin/config.cgi b/filemin/config.cgi index ea4bea25b..7a18aa2bc 100755 --- a/filemin/config.cgi +++ b/filemin/config.cgi @@ -41,7 +41,8 @@ print &ui_table_row($text{'config_columns_to_display'}, &ui_checkbox('columns', 'last_mod_time', $text{'last_mod_time'}, $config{'columns'} =~ /last_mod_time/) ); print &ui_table_row($text{'config_per_page'}, ui_textbox("per_page", $config{'per_page'}, 80)); -print &ui_table_row($text{'file_detect_encoding'}, &ui_yesno_radio('config_portable_module_filemanager_editor_detect_encoding', $config{'config_portable_module_filemanager_editor_detect_encoding'}, 'true', 'false')); +print &ui_table_row($text{'file_detect_encoding'}, &ui_yesno_radio('config_portable_module_filemanager_editor_detect_encoding', $config{'config_portable_module_filemanager_editor_detect_encoding'} ne 'false' ? 'true' : 'false', 'true', 'false')); +print &ui_table_row($text{'file_showhiddenfiles'}, &ui_yesno_radio('config_portable_module_filemanager_show_dot_files', $config{'config_portable_module_filemanager_show_dot_files'} ne 'false' ? 'true' : 'false', 'true', 'false')); print &ui_table_row($text{'config_bookmarks'}, &ui_textarea("bookmarks", $bookmarks, 5, 40)); print &ui_table_end(); diff --git a/filemin/config.info b/filemin/config.info index bad12de6f..fb1302645 100644 --- a/filemin/config.info +++ b/filemin/config.info @@ -1,2 +1,3 @@ max=Maximum size for uploaded files,3,Unlimited -config_portable_module_filemanager_editor_detect_encoding=Fix to prevent encoding detection if forbidden,1,true-Yes,false-No \ No newline at end of file +config_portable_module_filemanager_editor_detect_encoding=Fix to prevent encoding detection if forbidden,1,true-Yes,false-No +config_portable_module_filemanager_show_dot_files=Show hidden files,1,true-Yes,false-No \ No newline at end of file diff --git a/filemin/defaultuconf b/filemin/defaultuconf index 6158be3fe..0d6a181f3 100644 --- a/filemin/defaultuconf +++ b/filemin/defaultuconf @@ -1,3 +1,4 @@ columns=size,owner_user,permissions,last_mod_time per_page=50 -config_portable_module_filemanager_editor_detect_encoding=true \ No newline at end of file +config_portable_module_filemanager_editor_detect_encoding=true +config_portable_module_filemanager_show_dot_files=true diff --git a/filemin/index.cgi b/filemin/index.cgi index 055a0103b..c0782497b 100755 --- a/filemin/index.cgi +++ b/filemin/index.cgi @@ -18,7 +18,8 @@ unless (opendir ( DIR, $cwd )) { my %secontext; # Push file names with full paths to array, filtering out "." and ".." - @list = map { &simplify_path("$cwd/$_") } grep { $_ ne '.' && $_ ne '..' } readdir(DIR); + my $show_dot_files = $userconfig{'config_portable_module_filemanager_show_dot_files'} ne 'false'; + @list = map { &simplify_path("$cwd/$_") } grep { $_ ne '.' && $_ ne '..' && ($show_dot_files || ($_ !~ /^\./ && $_ !~ /\/\./)) } readdir(DIR); closedir(DIR); # Filter out not allowed paths diff --git a/filemin/lang/en b/filemin/lang/en index c7bf0a952..cbb5ac003 100644 --- a/filemin/lang/en +++ b/filemin/lang/en @@ -173,6 +173,7 @@ acls_action=Action acls_manual=Manual params acls_error=setfacl command is not found on your system file_detect_encoding=Automatically detect file encoding +file_showhiddenfiles=Show hidden files index_return=file listing upload_dirs=Directory Upload extract_uploaded=Extract Compressed diff --git a/filemin/save_config.cgi b/filemin/save_config.cgi index 46da0fe65..0bb413cbb 100755 --- a/filemin/save_config.cgi +++ b/filemin/save_config.cgi @@ -13,6 +13,7 @@ $columns =~ s/\0/,/g; 'columns' => $columns, 'per_page' => $in{'per_page'}, 'config_portable_module_filemanager_editor_detect_encoding' => $in{'config_portable_module_filemanager_editor_detect_encoding'}, + 'config_portable_module_filemanager_show_dot_files' => $in{'config_portable_module_filemanager_show_dot_files'}, ); my $max_allowed = $in{'max_allowed'}; if($max_allowed) { From ac1a73c15412ccda74a63beacdbd02afffa1da65 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Fri, 29 Sep 2023 17:23:52 +0300 Subject: [PATCH 2/2] Update CHANGELOG.md for 2.103 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eba4d40bf..cf61fbe5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ ## Changelog -#### 2.103 (September 18, 2023) +#### 2.103 (September 30, 2023) * Add support for hostname detection using `hostnamectl` command * Add support for other ACME services +* Add ability to hide dotfiles in File Manager [#1578](https://github.com/webmin/authentic-theme/issues/1578) +* Add `xz`, `zstd` and plain `tar` support when creating archives in File Manager [#2009](https://github.com/webmin/webmin/issues/2009) +* Add support for English (United States) (military time) locale * Fix to correctly switch key hash type with ACME services * Fix bug when `backend` wasn't saved correctly in Fail2Ban module [#1992](https://github.com/webmin/webmin/issues/1992) * Fix large files download in Upload and Download module