Don't set un-needed headers

https://www.virtualmin.com/node/19239

diff --git a/mailboxes/send_mail.cgi b/mailboxes/send_mail.cgi
index b5a0fa8..5d6a2a6 100755 (executable)
--- a/mailboxes/send_mail.cgi
+++ b/mailboxes/send_mail.cgi
@@ -50,9 +50,13 @@ $newmid = &generate_message_id($in{'from'});
 $mail->{'headers'} = [ [ 'From', $in{'from'} ],
                       [ 'Subject', &encode_mimewords($in{'subject'}) ],
                       [ 'To', &encode_mimewords($in{'to'}) ],
-                      [ 'Cc', &encode_mimewords($in{'cc'}) ],
-                      [ 'Bcc', &encode_mimewords($in{'bcc'}) ],
                       [ 'Message-Id', $newmid ] ];
+if ($in{'cc'}) {
+       push(@{$mail->{'headers'}}, [ 'Cc', &encode_mimewords($in{'cc'}) ]);
+       }
+if ($in{'bcc'}) {
+       push(@{$mail->{'headers'}}, [ 'Bcc', &encode_mimewords($in{'bcc'}) ]);
+       }
 &add_mailer_ip_headers($mail->{'headers'});
 push(@{$mail->{'headers'}}, [ 'X-Priority', $in{'pri'} ]) if ($in{'pri'});
 $in{'body'} =~ s/\r//g;