Re-factor headers

diff --git a/mailboxes/boxes-lib.pl b/mailboxes/boxes-lib.pl
index 9d20734..6ddc386 100644 (file)
--- a/mailboxes/boxes-lib.pl
+++ b/mailboxes/boxes-lib.pl
@@ -2578,4 +2578,18 @@ sub notes_decode
 # Deprecated - does nothing
 }
 
+# add_mailer_ip_headers(&headers)
+# Add X-Mailer and X-Originating-IP headers, if enabled
+sub add_mailer_ip_headers
+{
+local ($headers) = @_;
+if (!$config{'no_orig_ip'}) {
+       push(@$headers, [ 'X-Originating-IP', $ENV{'REMOTE_ADDR'} ]);
+       }
+if (!$config{'no_mailer'}) {
+       push(@$headers, [ 'X-Mailer', ucfirst(&get_product_name())." ".
+                                     &get_webmin_version() ]);
+       }
+}
+
 1;

diff --git a/mailboxes/send_mail.cgi b/mailboxes/send_mail.cgi
index b08540a..73aa0e5 100755 (executable)
--- a/mailboxes/send_mail.cgi
+++ b/mailboxes/send_mail.cgi
@@ -53,14 +53,7 @@ $mail->{'headers'} = [ [ 'From', $in{'from'} ],
                       [ 'Cc', &encode_mimewords($in{'cc'}) ],
                       [ 'Bcc', &encode_mimewords($in{'bcc'}) ],
                       [ 'Message-Id', $newmid ] ];
-if (!$config{'no_orig_ip'}) {
-       push(@{$mail->{'headers'}},
-            [ 'X-Originating-IP', $ENV{'REMOTE_ADDR'} ]);
-       }
-if (!$config{'no_mailer'}) {
-       push(@{$mail->{'headers'}},
-            [ 'X-Mailer', "Webmin ".&get_webmin_version() ]);
-       }
+&add_mailer_ip_headers($mail->{'headers'});
 push(@{$mail->{'headers'}}, [ 'X-Priority', $in{'pri'} ]) if ($in{'pri'});
 $in{'body'} =~ s/\r//g;
 if ($in{'body'} =~ /\S/) {