From ea0fcd9923d0be9138df80e52770a9385679a2ef Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Fri, 23 Oct 2020 17:11:50 +0300 Subject: [PATCH 1/3] Decode UTF7 encoded folders names https://github.com/webmin/usermin/issues/62 --- mailbox/mailbox-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailbox/mailbox-lib.pl b/mailbox/mailbox-lib.pl index 6b458225..4e59237d 100755 --- a/mailbox/mailbox-lib.pl +++ b/mailbox/mailbox-lib.pl @@ -307,7 +307,7 @@ sub list_folders my $fn = $4 || $3; next if ($fn eq "INBOX"); push(@rv, - { 'name' => $fn, + { 'name' => &decode_utf7($fn), 'id' => $fn, 'type' => 4, 'server' => $imapserver, From 89b525840634a1aac5d06db90d347210b3762e93 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Fri, 23 Oct 2020 22:59:50 +0300 Subject: [PATCH 2/3] Fix indent --- mailbox/mailbox-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailbox/mailbox-lib.pl b/mailbox/mailbox-lib.pl index 4e59237d..39493014 100755 --- a/mailbox/mailbox-lib.pl +++ b/mailbox/mailbox-lib.pl @@ -315,7 +315,7 @@ sub list_folders 'pass' => $rv[0]->{'pass'}, 'mode' => 0, 'remote' => 1, - 'flags' => 1, + 'flags' => 1, 'imapauto' => 1, 'mailbox' => $fn, 'nologout' => $config{'nologout'}, From ced77453e4c752d3c493eb0d7440c1718a4582dd Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Mon, 26 Oct 2020 16:03:51 +0300 Subject: [PATCH 3/3] Fix to consider Maildir storage format https://github.com/webmin/usermin/issues/62 --- mailbox/mailbox-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailbox/mailbox-lib.pl b/mailbox/mailbox-lib.pl index 39493014..062085f5 100755 --- a/mailbox/mailbox-lib.pl +++ b/mailbox/mailbox-lib.pl @@ -561,7 +561,7 @@ sub list_folders # is ignored next if (!-d $p); } - push(@rv, { 'name' => $name, + push(@rv, { 'name' => decode_utf7($name), 'file' => $p, 'type' => &folder_type($p), 'perpage' => $userconfig{"perpage_$f"},