Bug 124174 - make processmail a package (Bugzilla::BugMail), r=gerv, r=jth, a=justdave

4 files changed, 75 insertions, 5 deletions

diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 56e71ccba..2b985bd0c 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -26,7 +26,6 @@
   # contenttype: string. The Content Type we attached it as.
   # contenttypemethod: string. How we got the content type of the attachment.
   #  Possible values: autodetect, list, manual.
-  # mailresults: string. who was mailed, and who wasn't.
   #%]
   
 [% PROCESS global/header.html.tmpl 
@@ -42,7 +41,7 @@
         to <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a> Created
       </h2>
 
-      [% mailresults %]
+      [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
 
       [% IF contenttypemethod == 'autodetect' %]
         <p>
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index 2c7ceb24d..df5f4665a 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -23,7 +23,6 @@
 [%# INTERFACE:
   # bugid: integer. ID of the bug we are updating.
   # attachid: integer. ID of the attachment we just attached.
-  # mailresults: string. Who was mailed and who wasn't. 
   #%]
   
 [% PROCESS global/header.html.tmpl 
@@ -40,7 +39,7 @@
         <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
         of bug [% bugid %] submitted
       </h2>
-      [% mailresults %]
+      [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
     </td>
 
     <td>
diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl
new file mode 100644
index 000000000..5445ef9cd
--- /dev/null
+++ b/template/en/default/bug/process/bugmail.html.tmpl
@@ -0,0 +1,70 @@
+<!-- 1.0@bugzilla.org -->
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Bradley Baetz <bbaetz@student.usyd.edu.au>
+  #                 J. Paul Reed <preed@sigkill.com>
+  #%]
+
+[%# INTERFACE:
+  # mailing_bugid: string. ID of the bug this mail is concerning.
+  # mailrecipients: hash. People involved in this change. Hash has up to five 
+  #                elements:
+  #                changer: string. The login name of the user who made the 
+  #                change.
+  #
+  #                For bug changes where people need to be notified:
+  #                 owner: string. The login name of the bug assignee.
+  #                 reporter: string. The login name of the bug reporter.
+  #                 qacontact: string. The login name of the bug's QA contact. 
+  #                  Optional.
+  #                 cc: list of strings. The login names of those on the CC 
+  #                  list.
+  #%]
+
+[% mail = SendBugMail(mailing_bugid, mailrecipients) %]
+
+[% PROCESS emails
+   description = "Email sent to"
+   names = mail.sent
+%]
+<br>
+[% PROCESS emails
+   description = "Excluding"
+   names = mail.excluded
+%]
+<br>
+<center>
+  If you wish to tweak the kinds of mail Bugzilla sends you, you can
+  <a href="userprefs.cgi?tab=email">change your preferences</a>.
+</center>
+
+
+[%############################################################################%]
+[%# Block for a set of email addresses                                       #%]
+[%############################################################################%]
+
+[% BLOCK emails %]
+  <b>[% description %]:</b>
+  [% IF names.size > 0 %]
+    [%+ FOREACH name = names %]
+      [% name %][% ", " UNLESS loop.last() %] 
+    [% END %]
+  [% ELSE %]
+    no one
+  [% END %]
+[% END %]
diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index 99dfbc11d..cc3e0df95 100644
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -25,6 +25,8 @@
   # type: string; the type of change/check that was made: "bug" when a bug
   #   is changed, "dupe" when a duplication notation is added to a bug,
   #   and "dep" when a bug is checked for changes to its dependencies.
+  # 
+  # mailrecipients: hash; BugMail recipient params. Optional.
   #%]
 
 [% DEFAULT type="bug" %]
@@ -43,7 +45,7 @@
   <tr>
     <td>
       <h2>[% title.$type %]</h2>
-      [% mail %]
+      [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
     </td>
     <td>
       <a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a>