Bug 135812: Add a 'mailfrom' parameter to unify bugmail originating address -…

Bugzilla/Config/MTA.pm

@@ -51,6 +51,12 @@ sub get_param_list {
   },
 
   {
+   name => 'mailfrom',
+   type => 't',
+   default => 'bugzilla-daemon'
+  },
+
+  {
    name => 'sendmailnow',
    type => 'b',
    default => 1

template/en/default/account/cancel-token.txt.tmpl

@@ -22,9 +22,10 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% PROCESS subject %]
+X-Bugzilla-Type: admin
 
 A request was cancelled from [% remoteaddress %].
 

template/en/default/account/email/change-new.txt.tmpl

@@ -22,9 +22,10 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request
+X-Bugzilla-Type: admin
 
 [%+ terms.Bugzilla %] has received a request to change the email address
 for the account [% oldemailaddress %] to your address.

template/en/default/account/email/change-old.txt.tmpl

@@ -27,12 +27,13 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request
 Importance: High
 X-MSMail-Priority: High
 X-Priority: 1
+X-Bugzilla-Type: admin
 
 [%+ terms.Bugzilla %] has received a request to change the email address
 for your account to [%+ newemailaddress %].

template/en/default/account/email/request-new.txt.tmpl

@@ -23,9 +23,10 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% expiration_ts = token_ts + (constants.MAX_TOKEN_AGE * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
 To: [% email %]
 Subject: [% terms.Bugzilla %]: confirm account creation
+X-Bugzilla-Type: admin
 
 [%+ terms.Bugzilla %] has received a request to create a user account
 using your email address ([% email %]).

template/en/default/account/password/forgotten-password.txt.tmpl

@@ -22,9 +22,10 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject:  [% terms.Bugzilla %] Change Password Request
+X-Bugzilla-Type: admin
 
 You have (or someone impersonating you has) requested to change your 
 [%+ terms.Bugzilla %] password. To complete the change, visit the following link:

template/en/default/admin/params/mta.html.tmpl

@@ -44,6 +44,9 @@
                              </li>
                            </ul>",
 
+  mailfrom => "The email address of the $terms.Bugzilla mail daemon.  Some email systems " _
+              "require this to be a valid email address.",
+
   sendmailnow => "Sites using anything older than version 8.12 of 'sendmail' " _
                  "can achieve a significant performance increase in the " _
                  "UI -- at the cost of delaying the sending of mail -- by " _

template/en/default/email/newchangedmail.txt.tmpl

@@ -20,10 +20,11 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-From: bugzilla-daemon
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [[% terms.Bug %] [%+ bugid %]] [% neworchanged %][%+ summary %]
 X-Bugzilla-Reason: [% reasonsheader %]
+X-Bugzilla-Type: newchanged
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]

template/en/default/email/sudo.txt.tmpl

@@ -22,10 +22,11 @@
 [% PROCESS global/variables.none.tmpl %]
 
 Content-Type: text/plain
-From: [% Param("maintainer") %]
+From: [% Param('mailfrom') %]
 To: [% user.email %]
 Subject: [[% terms.Bugzilla %]] Your account [% user.login -%]
  is being impersonated
+X-Bugzilla-Type: admin
 
     [%+ sudoer.identity %] has used the 'sudo' feature to access 
 [%+ terms.Bugzilla %] using your account.

template/en/default/email/votes-removed.txt.tmpl

@@ -21,9 +21,10 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: bugzilla-daemon
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.
+X-Bugzilla-Type: voteremoved
 
 Some or all of your votes have been removed from [% terms.bug %] [%+ bugid %].
 

template/en/default/email/whine.txt.tmpl

@@ -20,9 +20,10 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-From: [% Param("maintainer") %]
+From: [% Param("mailfrom") %]
 To: [% email %][% Param("emailsuffix") %]
 Subject: Your [% terms.Bugzilla %] buglist needs attention.
+X-Bugzilla-Type: whine
 
 [This e-mail has been automatically generated.]
 

template/en/default/request/email.txt.tmpl

@@ -36,9 +36,10 @@
   [% END %]
   [% subject_status = statuses.${flag.status} %]
 [% END %]
-From: bugzilla-request-daemon
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
+X-Bugzilla-Type: request
 [%- IF attachment %] :
   [Attachment [% attachment.id %]] [% attachment.description %][% END %]
 

whine.pl

@@ -93,13 +93,13 @@ my $sth_schedules_by_event = $dbh->prepare(
 # After that, it looks over each user to see if they have schedules that need
 # running, then runs those and generates the email messages.
 
-# Send whines from the address in the 'maintainer' Parameter so that all
+# Send whines from the address in the 'mailfrom' Parameter so that all
 # Bugzilla-originated mail appears to come from a single address.
-my $fromaddress = Bugzilla->params->{'maintainer'};
+my $fromaddress = Bugzilla->params->{'mailfrom'};
 
 if ($fromaddress !~ Bugzilla->params->{'emailregexp'}) {
     die "Cannot run.  " .
-        "The maintainer email address has not been properly set!\n";
+        "The Bugzilla email address has not been properly set!\n";
 }
 
 # get the current date and time