From 8ef31d2af140f70ad04825ed38007c3078f1c614 Mon Sep 17 00:00:00 2001
From: "jake%bugzilla.org" <>
Date: Thu, 17 Mar 2005 05:58:54 +0000
Subject: Backing out the fix for bug 135812 as it causes the mail params to be
deleted on new installs.
---
Bugzilla/Config.pm | 12 ------------
defparams.pl | 20 ++++----------------
template/en/default/account/cancel-token.txt.tmpl | 3 +--
.../en/default/account/email/change-new.txt.tmpl | 3 +--
.../en/default/account/email/change-old.txt.tmpl | 3 +--
.../account/password/forgotten-password.txt.tmpl | 3 +--
template/en/default/request/email.txt.tmpl | 3 +--
template/en/default/whine/multipart-mime.txt.tmpl | 1 -
whine.pl | 6 +++---
9 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index c1c317d57..6bc149be9 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -251,18 +251,6 @@ sub UpdateParams {
delete $param{'enablequips'};
}
- # Update e-mail text to use new mailfrom param (Bug 135812)
- if (!exists $param{'mailfrom'}) {
- $param{'passwordmail'} =~ s/^From: bugzilla-daemon$/From: %mailfrom%/mi;
- $param{'passwordmail'} =~ s/\n\n/\nX-Bugzilla-Type: admin\n\n/;
- $param{'newchangedmail'} =~ s/^From: bugzilla-daemon$/From: %mailfrom%/mi;
- $param{'newchangedmail'} =~ s/\n\n/\nX-Bugzilla-Type: newchanged\n\n/;
- $param{'voteremovedmail'} =~ s/^From: bugzilla-daemon$/From: %mailfrom%/mi;
- $param{'voteremovedmail'} =~ s/\n\n/\nX-Bugzilla-Type: voteremoved\n\n/;
- $param{'whinemail'} =~ s/^From: %maintainer%$/From: %mailfrom%/mi;
- $param{'whinemail'} =~ s/\n\n/\nX-Bugzilla-Type: whine\n\n/;
- }
-
# --- DEFAULTS FOR NEW PARAMS ---
foreach my $item (@param_list) {
diff --git a/defparams.pl b/defparams.pl
index 30e7ed72a..5e2110d61 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -307,14 +307,6 @@ sub find_languages {
default => 'THE MAINTAINER HAS NOT YET BEEN SET'
},
- {
- name => 'mailfrom',
- desc => 'The email address of the Bugzilla mail daemon. Some email systems ' .
- 'require this to be a valid email address.',
- type => 't',
- default => 'bugzilla-daemon'
- },
-
{
name => 'urlbase',
desc => 'The URL that is the common initial leading part of all Bugzilla ' .
@@ -726,10 +718,9 @@ sub find_languages {
'password. %anythingelse% gets replaced by the ' .
'definition of that parameter (as defined on this page).',
type => 'l',
- default => 'From: %mailfrom%
+ default => 'From: bugzilla-daemon
To: %mailaddress%
Subject: Your Bugzilla password.
-X-Bugzilla-Type: admin
To use the wonders of Bugzilla, you can use the following:
@@ -762,12 +753,11 @@ To use the wonders of Bugzilla, you can use the following:
'replaced by the definition of that parameter (as defined on ' .
'this page).',
type => 'l',
- default => 'From: %mailfrom%
+ default => 'From: bugzilla-daemon
To: %to%
Subject: [Bug %bugid%] %neworchanged%%summary%
%threadingmarker%
X-Bugzilla-Reason: %reasonsheader%
-X-Bugzilla-Type: newchanged
%urlbase%show_bug.cgi?id=%bugid%
@@ -799,10 +789,9 @@ Configure bugmail: %urlbase%userprefs.cgi?tab=email
'address, so that if the mail bounces, a real person can know '.
'that there are bugs assigned to an invalid address.',
type => 'l',
- default => 'From: %mailfrom%
+ default => 'From: %maintainer%
To: %email%
Subject: Your Bugzilla buglist needs attention.
-X-Bugzilla-Type: whine
[This e-mail has been automatically generated.]
@@ -1043,10 +1032,9 @@ You will get this message once a day until you\'ve dealt with these bugs!
'compatibility. %anythingelse% gets replaced by the ' .
'definition of that parameter (as defined on this page).',
type => 'l',
- default => 'From: %mailfrom%
+ default => 'From: bugzilla-daemon
To: %to%
Subject: [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 bug %bugid%.
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index 38ad37bef..de2278419 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -22,10 +22,9 @@
[% PROCESS global/variables.none.tmpl %]
-From: [% Param('mailfrom') %]
+From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: [% PROCESS subject %]
-X-B[%#%]ugzilla-Type: admin
A request was cancelled from [% remoteaddress %].
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index cbc0af1e7..7113504d8 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -22,10 +22,9 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: [% Param('mailfrom') %]
+From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request
-X-B[%#%]ugzilla-Type: admin
[%+ terms.Bugzilla %] has received a request to change the email address
for the account [% oldemailaddress %] to your address.
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index 12de7530d..272f6d4e5 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -27,13 +27,12 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: [% Param('mailfrom') %]
+From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request
Importance: High
X-MSMail-Priority: High
X-Priority: 1
-X-B[%#%]ugzilla-Type: admin
[%+ terms.Bugzilla %] has received a request to change the email address
for your account to [%+ newemailaddress %].
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index b56e930fd..5ac3ed75c 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -22,10 +22,9 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: [% Param('mailfrom') %]
+From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Password Request
-X-B[%#%]ugzilla-Type: admin
You have (or someone impersonating you has) requested to change your
[%+ terms.Bugzilla %] password. To complete the change, visit the following link:
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index f34227a56..719f9d869 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -36,11 +36,10 @@
[% to_identity = flag.setter.identity _ "'s request" %]
[% subject_status = statuses.${flag.status} %]
[% END %]
-From: [% Param('mailfrom') %]
+From: bugzilla-request-daemon
To: [% to_email %]
CC: [% flag.type.cc_list %]
Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %]
-X-B[%#%]ugzilla-Type: request
[%- IF flag.target.attachment.exists %] :
[Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]
diff --git a/template/en/default/whine/multipart-mime.txt.tmpl b/template/en/default/whine/multipart-mime.txt.tmpl
index 855cbd066..5e597d899 100644
--- a/template/en/default/whine/multipart-mime.txt.tmpl
+++ b/template/en/default/whine/multipart-mime.txt.tmpl
@@ -34,7 +34,6 @@
From: [% from %]
To: [% recipient.email %]
Subject: [[% terms.Bugzilla %]] [% subject %]
-X-B[%#%]ugzilla-Type: whine
MIME-Version: 1.0
Content-Type: multipart/alternative; boundary="[% boundary %]"
diff --git a/whine.pl b/whine.pl
index 0642ec5ab..8be68f42c 100755
--- a/whine.pl
+++ b/whine.pl
@@ -99,13 +99,13 @@ if (Param('shutdownhtml')) {
}
-# Send whines from the address in the 'mailfrom' Parameter so that all
+# Send whines from the address in the 'maintainer' Parameter so that all
# Bugzilla-originated mail appears to come from a single address.
-my $fromaddress = Param('mailfrom');
+my $fromaddress = Param('maintainer');
if ($fromaddress !~ Param('emailregexp')) {
die "Cannot run. " .
- "The Bugzilla email address has not been properly set!\n";
+ "The maintainer email address has not been properly set!\n";
}
# Check the nomail file for users who should not receive mail
--
cgit v1.2.3-24-g4f1b