Merge branch 'master' of github.com:webmin/usermin

webmin · Oct 8, 2023 · 9b55eba · 9b55eba
2 parents 483b17c + 84a5eb1
commit 9b55eba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/mailbox/list_folders.cgi b/mailbox/list_folders.cgi
@@ -38,12 +38,11 @@ print &ui_columns_start([ "",
 			  $text{'folders_type'},
 			  $text{'folders_size'},
 			  $text{'folders_action'} ], undef, 0, \@tds);
-			#   var_dump(\@folders);
 foreach my $f (@folders) {
 	my @cols;
 	my $deletable = 0;
-	if ($f->{'inbox'} || $f->{'drafts'} || $f->{'spam'}) {
-		# Inbox, drafs or spam folder which cannot be edited
+	if ($f->{'inbox'} || $f->{'sent'} || $f->{'drafts'} || $f->{'spam'}) {
+		# Inbox, drafs, sent or spam folder which cannot be edited
 		push(@cols, &html_escape($f->{'name'}));
 		}
 	elsif ($f->{'type'} == 2) {

diff --git a/mailbox/list_ifolders.cgi b/mailbox/list_ifolders.cgi
@@ -28,8 +28,8 @@ print &ui_columns_start([ "",
 foreach my $f (@folders) {
 	my @cols;
 	my $deletable = 0;
-	if ($f->{'inbox'} || $f->{'drafts'} || $f->{'spam'}) {
-		# Inbox, drafs or spam folder which cannot be edited
+	if ($f->{'inbox'} || $f->{'sent'} || $f->{'drafts'} || $f->{'spam'}) {
+		# Inbox, drafs, sent or spam folder which cannot be edited
 		push(@cols, &html_escape($f->{'name'}));
 		push(@cols, "IMAP");
 		push(@cols, &nice_size(&folder_size($f)));