Fix for bug 26194: There are now substitution parameters available for use in newchan...

that the person is receiving the mail in either an email header, the body of the message, or both.  The default newchangedmail
parameter includes these in it.  If you have an existing installation you will need to either hit "reset" next to the
newchangedmail parameter, or add the substitution parameters where you like them according to the instructions given in
editparams.cgi viewed from the web.
Patch by Matthew Tuck <matty@chariot.net.au> and Zach Lipton <zach@zachlipton.com>
r= justdave@syndicomm.com

diff --git a/defparams.pl b/defparams.pl
index 868efad920e2995055730e59bea721560c9398c0..418f56cae157fd89c00c1e05d8e1636ea17d5cea 100644 (file)
--- a/defparams.pl
+++ b/defparams.pl
@@ -375,8 +375,13 @@ text, %to% gets replaced with the e-mail address of the person recieving
 the mail.  %bugid% gets replaced by the bug number.  %diffs% gets
 replaced with what's changed.  %neworchanged% is "New:" if this mail is
 reporting a new bug or empty if changes were made to an existing one.
-%summary% gets replaced by the summary of this bug. %<i>anythingelse</i>%
-gets replaced by the definition of that parameter (as defined on this
+%summary% gets replaced by the summary of this bug. %reasonsheader% 
+is replaced by an abbreviated list of reasons why the user is getting the email,
+suitable for use in an email header (such as X-Bugzilla-Reason).
+%reasonsbody% is replaced by text that explains why the user is getting the email 
+in more user friendly text than %reasonsheader%.
+%<i>anythingelse</i>% gets replaced by the definition of 
+that parameter (as defined on this
 page).},
          "l",
 "From: bugzilla-daemon
@@ -386,9 +391,11 @@ X-Bugzilla-Reason: %reasonsheader%
 
 %urlbase%show_bug.cgi?id=%bugid%
 
-%reasonsbody%
+%diffs%
 
-%diffs%");
+
+
+%reasonsbody%");
 
 
 

diff --git a/processmail b/processmail
index 3140361a6247a4b997a3a889b38ddc5555bd0ac6..1a506211bcffcb2ab254cea834d7266037174736 100755 (executable)
--- a/processmail
+++ b/processmail
@@ -687,7 +687,7 @@ sub NewProcessOnePerson ($$$$$$$$$$$) {
       return;
     }
     
-    my $reasonsbody = "You are receiving this mail because:\n";
+    my $reasonsbody = "------- You are receiving this mail because: -------\n";
 
     if (scalar(@reasons) == 0) {
         $reasonsbody .= "Whoops!  I have no idea!\n";