summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authortravis%sedsystems.ca <>2005-03-16 01:44:06 +0100
committertravis%sedsystems.ca <>2005-03-16 01:44:06 +0100
commit5d6b815d1ce8eece29e22e09781f890375f3c403 (patch)
treebaa11798e9e3fd48fc37db3f8b99ffa0e56cd997 /Bugzilla
parenta54f3f23447038f15de353b3a8642701325b00ec (diff)
downloadbugzilla-5d6b815d1ce8eece29e22e09781f890375f3c403.tar.gz
bugzilla-5d6b815d1ce8eece29e22e09781f890375f3c403.tar.xz
Bug 135812 : Add a 'mailfrom' parameter to unify bugmail originating address
Patch by Cedric Caron <cedric.caron@urbanet.ch> r=wurblzap a=justdave
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Config.pm12
1 files changed, 12 insertions, 0 deletions
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index 6bc149be9..c1c317d57 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -251,6 +251,18 @@ 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) {