Index: Bugzilla.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla.pm,v
retrieving revision 1.8
diff -u -r1.8 Bugzilla.pm
--- Bugzilla.pm	7 Jun 2003 13:59:24 -0000	1.8
+++ Bugzilla.pm	12 Jul 2003 09:06:56 -0000
@@ -39,6 +39,21 @@
     return $_template;
 }

+##
+## We need a separate TT instance because process() isn't reentrant; it turns
+## out that for bugactivity pages, since we send mail from a template now
+## (see bug 124174) using the same TT instance causes the process() handling
+## the generation of email to step on the previously called process() handling
+## the generation of the webpage; this fixes that.
+##
+
+my $_mail_template;
+sub mail_template {
+    my $class = shift;
+    $_mail_template ||= Bugzilla::Template->create();
+    return $_mail_template;
+}
+
 my $_cgi;
 sub cgi {
     my $class = shift;
@@ -246,6 +261,10 @@
 =item C<template>

 The current C<Template> object, to be used for output
+
+=item C<mail_template>
+
+The current C<Template> object, to be used for email output ONLY!

 =item C<cgi>

Index: CGI.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/CGI.pl,v
retrieving revision 1.204
diff -u -r1.204 CGI.pl
--- CGI.pl	3 Jun 2003 09:47:37 -0000	1.204
+++ CGI.pl	12 Jul 2003 09:06:57 -0000
@@ -212,16 +212,16 @@

 sub MailPassword {
     my ($login, $password) = (@_);
-    my $urlbase = Param("urlbase");
-    my $template = Param("passwordmail");
-    my $msg = PerformSubsts($template,
-                            {"mailaddress" => $login . Param('emailsuffix'),
-                             "login" => $login,
-                             "password" => $password});

-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $msg;
-    close SENDMAIL;
+    my $messageInfo = {};
+
+    ## Explicitly set the From: to be the BZ server
+    $messageInfo->{'envelopeFrom'} = Param('bzmailfrom');
+    $messageInfo->{'envelopeTo'} = $login . Param('emailsuffix');
+    $messageInfo->{'login'} = $login;
+    $messageInfo->{'password'} = $password;
+
+    MailMessage('mailpassword', $messageInfo);
 }

 sub confirm_login {
Index: Token.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Token.pm,v
retrieving revision 1.19
diff -u -r1.19 Token.pm
--- Token.pm	7 Jun 2003 03:36:43 -0000	1.19
+++ Token.pm	12 Jul 2003 09:06:57 -0000
@@ -74,37 +74,24 @@

     # Mail the user the token along with instructions for using it.

-    my $template = $::template;
-    my $vars = $::vars;
+    my $messageInfo = {};
+    $messageInfo->{'envelopeFrom'} = Param('bzmailfrom');
+    $messageInfo->{'envelopeTo'} = $old_email . Param('emailsuffix');

-    $vars->{'oldemailaddress'} = $old_email . Param('emailsuffix');
-    $vars->{'newemailaddress'} = $new_email . Param('emailsuffix');
+    $messageInfo->{'oldemailaddress'} = $old_email . Param('emailsuffix');
+    $messageInfo->{'newemailaddress'} = $new_email . Param('emailsuffix');

-    $vars->{'max_token_age'} = $maxtokenage;
-    $vars->{'token_ts'} = $token_ts;
+    $messageInfo->{'max_token_age'} = $maxtokenage;
+    $messageInfo->{'token_ts'} = $token_ts;
+    $messageInfo->{'token'} = $token;

-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $old_email . Param('emailsuffix');
+    MailMessage('emailchange-old', $messageInfo);

-    my $message;
-    $template->process("account/email/change-old.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-    $vars->{'token'} = $newtoken;
-    $vars->{'emailaddress'} = $new_email . Param('emailsuffix');
-
-    $message = "";
-    $template->process("account/email/change-new.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
+    ## From: doesn't change
+    $messageInfo->{'envelopeTo'} = $new_email . Param('emailsuffix');
+    $messageInfo->{'token'} = $newtoken;

+    MailMessage('emailchange-new', $messageInfo);
 }

 sub IssuePasswordToken {
@@ -133,25 +120,16 @@
     &::SendSQL("UNLOCK TABLES");

     # Mail the user the token along with instructions for using it.
-
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $loginname . Param('emailsuffix');
-
-    $vars->{'max_token_age'} = $maxtokenage;
-    $vars->{'token_ts'} = $token_ts;

-    my $message = "";
-    $template->process("account/password/forgotten-password.txt.tmpl",
-                                                               $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
+    my $messageInfo = {};
+    $messageInfo->{'envelopeFrom'} = Param('bzmailfrom');
+    $messageInfo->{'envelopeTo'} = $loginname . Param('emailsuffix');
+
+    $messageInfo->{'token'} = $token;
+    $messageInfo->{'max_token_age'} = $maxtokenage;
+    $messageInfo->{'token_ts'} = $token_ts;

+    MailMessage('forgotten-password', $messageInfo);
 }


@@ -206,30 +184,18 @@
                 AND     token = $quotedtoken");
     my ($issuedate, $tokentype, $eventdata, $loginname, $realname) = &::FetchSQLData();

-    # Get the email address of the Bugzilla maintainer.
-    my $maintainer = Param('maintainer');
+    my $messageInfo = {};

-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'emailaddress'} = $loginname . Param('emailsuffix');
-    $vars->{'maintainer'} = $maintainer;
-    $vars->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'};
-    $vars->{'token'} = $token;
-    $vars->{'tokentype'} = $tokentype;
-    $vars->{'issuedate'} = $issuedate;
-    $vars->{'eventdata'} = $eventdata;
-    $vars->{'cancelaction'} = $cancelaction;
+    $messageInfo->{'emailaddress'} = $loginname . Param('emailsuffix');
+    $messageInfo->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'};
+    $messageInfo->{'token'} = $token;
+    $messageInfo->{'tokentype'} = $tokentype;
+    $messageInfo->{'issuedate'} = $issuedate;
+    $messageInfo->{'eventdata'} = $eventdata;
+    $messageInfo->{'cancelaction'} = $cancelaction;

     # Notify the user via email about the cancellation.
-
-    my $message;
-    $template->process("account/cancel-token.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
+    MailMessage('cancel-token', $messageInfo);

     # Delete the token from the database.
     &::SendSQL("LOCK TABLES tokens WRITE");
Index: checksetup.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/checksetup.pl,v
retrieving revision 1.236
diff -u -r1.236 checksetup.pl
--- checksetup.pl	10 Jul 2003 14:53:46 -0000	1.236
+++ checksetup.pl	12 Jul 2003 09:07:10 -0000
@@ -269,6 +269,11 @@
 my $gdgraph     = have_vers("GD::Graph",0);
 my $gdtextalign = have_vers("GD::Text::Align",0);

+# Net::SMTP 2.19 is part of libnet 1.0703; 2.19 was picked as a minimal
+# version because libnet 1.0703 shipped with RedHat 7.2, the API is the same,
+# and there are no known bugs in that version.
+my $netsmtp     = have_vers("Net::SMTP", "2.19");
+
 print "\n" unless $silent;
 if ((!$gd || !$chartbase) && !$silent) {
     print "If you you want to see graphical bug charts (plotting historical ";
@@ -295,6 +300,15 @@
            "-e'install \"GD::Text::Align\"'\n" if !$gdtextalign;
     print "\n";
 }
+if (!$netsmtp && !$silent) {
+    print "If you you want Bugzilla to send mail directly using the SMTP ";
+    print "capabilities of any MTA, you should install Net::SMTP; it comes ";
+    print "with most default perl installations these days. As of 2.18, this ";
+    print "method is the default (and highly suggested) way of sending mail. ";
+    print "If you don't have it, run:\n";
+    print "Net::SMTP:       perl -MCPAN -e'install \"Net::SMTP\"'\n" if
+     !$netsmtp;
+}
 if (%missing) {
     print "\n\n";
     print "Bugzilla requires some Perl modules which are either missing from your\n",
@@ -4024,6 +4038,4 @@
 $dbh->do("UPDATE components SET initialowner = $adminuid WHERE initialowner = 0");

 unlink "data/versioncache";
-
-print "Reminder: Bugzilla now requires version 8.7 or later of sendmail.\n" unless $silent;

Index: defparams.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/defparams.pl,v
retrieving revision 1.115
diff -u -r1.115 defparams.pl
--- defparams.pl	24 Apr 2003 22:41:07 -0000	1.115
+++ defparams.pl	12 Jul 2003 09:07:12 -0000
@@ -440,71 +440,6 @@
   },

   {
-   name => 'sendmailnow',
-   desc => 'If this is on, Bugzilla will tell sendmail to send any e-mail ' .
-           'immediately. If you have a large number of users with a large ' .
-           'amount of e-mail traffic, enabling this option may dramatically ' .
-           'slow down Bugzilla. Best used for smaller installations of ' .
-           'Bugzilla.',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'passwordmail',
-   desc => 'The email that gets sent to people to tell them their password.' .
-           'Within this text, %mailaddress% gets replaced by the person\'s ' .
-           'email address, %login% gets replaced by the person\'s login ' .
-           '(usually the same thing), and %password% gets replaced by their ' .
-           'password.  %<i>anythingelse</i>% gets replaced by the ' .
-           'definition of that parameter (as defined on this page).',
-   type => 'l',
-   default => 'From: bugzilla-daemon
-To: %mailaddress%
-Subject: Your Bugzilla password.
-
-To use the wonders of Bugzilla, you can use the following:
-
- E-mail address: %login%
-       Password: %password%
-
- To change your password, go to:
- %urlbase%userprefs.cgi
-'
-  },
-
-  {
-   name => 'newchangedmail',
-   desc => 'The email that gets sent to people when a bug changes. Within ' .
-           'this 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. %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).',
-   type => 'l',
-   default => 'From: bugzilla-daemon
-To: %to%
-Subject: [Bug %bugid%] %neworchanged%%summary%
-X-Bugzilla-Reason: %reasonsheader%
-
-%urlbase%show_bug.cgi?id=%bugid%
-
-%diffs%
-
---%space%
-Configure bugmail: %urlbase%userprefs.cgi?tab=email
-%reasonsbody%'
-  },
-
-  {
    name => 'whinedays',
    desc => 'The number of days that we\'ll let a bug sit untouched in a NEW ' .
            'state before our cronjob will whine at the owner.',
@@ -513,59 +448,6 @@
   },

   {
-   name => 'whinemail',
-   desc => 'The email that gets sent to anyone who has a NEW bug that '.
-           'hasn\'t been touched for more than <b>whinedays</b>.  Within ' .
-           'this text, %email% gets replaced by the offender\'s email ' .
-           'address. %userid% gets replaced by the offender\'s bugzilla ' .
-           'login (which, in most installations, is the same as the email ' .
-           ' address.) %<i>anythingelse</i>% gets replaced by the definition ' .
-           'of that parameter (as defined on this page).<p> It is a good ' .
-           'idea to make sure this message has a valid From: 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: %maintainer%
-To: %email%
-Subject: Your Bugzilla buglist needs attention.
-
-[This e-mail has been automatically generated.]
-
-You have one or more bugs assigned to you in the Bugzilla
-bugsystem (%urlbase%) that require
-attention.
-
-All of these bugs are in the NEW state, and have not been touched
-in %whinedays% days or more.  You need to take a look at them, and
-decide on an initial action.
-
-Generally, this means one of three things:
-
-(1) You decide this bug is really quick to deal with (like, it\'s INVALID),
-    and so you get rid of it immediately.
-(2) You decide the bug doesn\'t belong to you, and you reassign it to someone
-    else.  (Hint: if you don\'t know who to reassign it to, make sure that
-    the Component field seems reasonable, and then use the "Reassign bug to
-    owner of selected component" option.)
-(3) You decide the bug belongs to you, but you can\'t solve it this moment.
-    Just use the "Accept bug" command.
-
-To get a list of all NEW bugs, you can use this URL (bookmark it if you like!):
-
-   %urlbase%buglist.cgi?bug_status=NEW&assigned_to=%userid%
-
-Or, you can use the general query page, at
-%urlbase%query.cgi.
-
-Appended below are the individual URLs to get to all of your NEW bugs that
-haven\'t been touched for a week or more.
-
-You will get this message once a day until you\'ve dealt with these bugs!
-
-'
-  },
-
-  {
    name => 'defaultquery',
    desc => 'This is the default query that initially comes up when you ' .
            'submit a bug.  It\'s in URL parameter format, which makes it ' .
@@ -731,36 +613,6 @@
   },

   {
-   name => 'voteremovedmail',
-   desc => 'This is a mail message to send to anyone who gets a vote removed ' .
-           'from a bug for any reason.  %to% gets replaced by the person who ' .
-           'used to be voting for this bug.  %bugid% gets replaced by the ' .
-           'bug number. %reason% gets replaced by a short reason describing ' .
-           'why the vote(s) were removed. %votesremoved%, %votesold% and ' .
-           '%votesnew% is the number of votes removed, before and after ' .
-           'respectively. %votesremovedtext%, %votesoldtext% and ' .
-           '%votesnewtext% are these as sentences, eg "You had 2 votes on ' .
-           'this bug."  %count% is also supported for backwards ' .
-           'compatibility. %<i>anythingelse</i>% gets replaced by the ' .
-           'definition of that parameter (as defined on this page).',
-   type => 'l',
-   default => 'From: bugzilla-daemon
-To: %to%
-Subject: [Bug %bugid%] Some or all of your votes have been removed.
-
-Some or all of your votes have been removed from bug %bugid%.
-
-%votesoldtext%
-
-%votesnewtext%
-
-Reason: %reason%
-
-%urlbase%show_bug.cgi?id=%bugid%
-'
-  },
-
-  {
    name => 'allowbugdeletion',
    desc => 'The pages to edit products and components and versions can delete ' .
            'all associated bugs when you delete a product (or component or ' .
@@ -1048,6 +900,56 @@
    type    => 'b',
    default => 1,
   },
+
+  {
+   name    => 'emaildelivery',
+   desc    => 'Is bug and other email from Bugzilla currently \'on\'?' .
+              '(site-wide toggle)',
+   type    => 'b',
+   default => 1,
+  },
+
+  {
+   name    => 'mailmodule',
+   desc    => 'The method this installation uses to send (bug, password ' .
+              'change, etc.) email',
+   type    => 's',
+   choices => [ Bugzilla::ProcessMail::GetMailModuleList() ],
+   default => 'netsmtp',
+  },
+
+  ## XXX - mailmodargs MUST BE AFTER mailmodule in the param list for
+  ## CheckMailModuleParams to work; see note in that function in
+  ## ProcessMail.pm for an explanation
+  {
+   name    => 'mailmodargs',
+   desc    => 'Module-specific arguments (semantics vary based upon module):' .
+              '<br><b>Net::SMTP</b> - domain name of your SMTP-speaking mail '.
+              'server<br><b>Sendmail</b> - location of the sendmail binary' .
+              ' and any arguments to pass during execution (be sure to add' .
+              ' <tt>-t</tt> and <tt>-i</tt> if actually using sendmail)<br>' .
+              ' <b>Debug</b> - location of the debug file',
+   type    => 't',
+   default => 'localhost',
+   checker => \&Bugzilla::ProcessMail::CheckMailModuleParams,
+  },
+
+  {
+   name    => 'bzmailfrom',
+   desc    => 'Email address Bugzilla server email appears to come from',
+   type    => 't',
+   default => 'bugzilla-daemon',
+  },
+
+  {
+   name    => 'bugmailfrom',
+   desc    => 'Does bug email appear to be from the Bugzilla server address ' .
+              '(bzmailfrom) or the user who generated it?',
+   type    => 's',
+   choices => [ 'fromserver', 'fromuser' ],
+   default => 'fromserver',
+   checker => \&check_multi,
+  },

 );

Index: doeditparams.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/doeditparams.cgi,v
retrieving revision 1.26
diff -u -r1.26 doeditparams.cgi
--- doeditparams.cgi	5 May 2003 01:15:21 -0000	1.26
+++ doeditparams.cgi	12 Jul 2003 09:07:12 -0000
@@ -27,6 +27,7 @@

 use Bugzilla;
 use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::ProcessMail;

 require "CGI.pl";

Index: globals.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/globals.pl,v
retrieving revision 1.241
diff -u -r1.241 globals.pl
--- globals.pl	23 Jun 2003 18:01:35 -0000	1.241
+++ globals.pl	12 Jul 2003 09:07:15 -0000
@@ -1291,32 +1291,18 @@

             # Now lets send the e-mail to alert the user to the fact that their votes have
             # been reduced or removed.
-            my $sendmailparm = '-ODeliveryMode=deferred';
-            if (Param('sendmailnow')) {
-               $sendmailparm = '';
-            }
-            if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t -i")) {
-                my %substs;

-                $substs{"to"} = $name;
-                $substs{"bugid"} = $id;
-                $substs{"reason"} = $reason;
+            my $messageInfo = {};

-                $substs{"votesremoved"} = $removedvotes;
-                $substs{"votesold"} = $oldvotes;
-                $substs{"votesnew"} = $newvotes;
+            $messageInfo->{'envelopeFrom'} = Param('bzmailfrom');
+            $messageInfo->{'envelopeTo'} = $name;
+            $messageInfo->{'reason'} = $reason;
+            $messageInfo->{'votesremoved'} = $removedvotes;
+            $messageInfo->{'votesold'} = $oldvotes;
+            $messageInfo->{'votesnew'} = $newvotes;
+            $messageInfo->{'count'} = $removedvotes . "\n    " . $newvotestext;

-                $substs{"votesremovedtext"} = $removedvotestext;
-                $substs{"votesoldtext"} = $oldvotestext;
-                $substs{"votesnewtext"} = $newvotestext;
-
-                $substs{"count"} = $removedvotes . "\n    " . $newvotestext;
-
-                my $msg = PerformSubsts(Param("voteremovedmail"),
-                                        \%substs);
-                print SENDMAIL $msg;
-                close SENDMAIL;
-            }
+            MailMessage('voterremoved', $messageInfo);
         }
         SendSQL("SELECT SUM(vote_count) FROM votes WHERE bug_id = $id");
         my $v = FetchOneColumn();
Index: importxml.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/importxml.pl,v
retrieving revision 1.33
diff -u -r1.33 importxml.pl
--- importxml.pl	5 May 2003 01:15:27 -0000	1.33
+++ importxml.pl	12 Jul 2003 09:07:16 -0000
@@ -26,6 +26,7 @@
 # is removed so you can pipe in email messages.

 use strict;
+use Bugzilla::ProcessMail;

 #####################################################################
 #
@@ -101,24 +102,18 @@
     return($_[0]);
 }

-sub MailMessage {
+sub Mail {
   my $subject = shift @_;
   my $message = shift @_;
   my @recipients = @_;

-  my $to = join (", ", @recipients);
-  my $header = "To: $to\n";
-  my $from = Param("moved-from-address");
-  $from =~ s/@/\@/g;
-  $header.= "From: Bugzilla <$from>\n";
-  $header.= "Subject: $subject\n\n";
-
-  open(SENDMAIL,
-    "|/usr/lib/sendmail -ODeliveryMode=background -t -i") ||
-      die "Can't open sendmail";
-  print SENDMAIL $header . $message . "\n";
-  close SENDMAIL;
+  my $messageInfo = {};
+  my $messageInfo->{'envelopeFrom'} = Param('moved-from-address');
+  my $messageInfo->{'envelopeTo'} = $to; ## XXX - This probably won't work
+  my $messageInfo->{'subject'} = $subject;
+  my $messageInfo->{'messagebody'} = $message;

+  MailMessage('importbugs', $messageInfo);
   Log($subject . " sent to: $to");
 }

@@ -175,7 +170,7 @@
   $message .=   "\n\nPlease re-open the original bug.\n";
   $message .= "\n\n$xml";
   my @to = (Param("maintainer"));
-  MailMessage ($subject, $message, @to);
+  Mail($subject, $message, @to);
   exit;
 }

@@ -188,7 +183,7 @@
   $message .=   "\n\nPlease re-open the original bug.\n";
   $message .= "\n\n$xml";
   my @to = (Param("maintainer"), $maintainer);
-  MailMessage ($subject, $message, @to);
+  Mail($subject, $message, @to);
   exit;
 }

@@ -199,7 +194,7 @@
   $message .= "at this site. For more info, contact ";
   $message .=  Param("maintainer") . ".\n";
   my @to = (Param("maintainer"), $maintainer, $exporter);
-  MailMessage ($subject, $message, @to);
+  Mail($subject, $message, @to);
   exit;
 }

@@ -211,7 +206,7 @@
   $message .= "\n\nPlease re-open the original bug.\n";
   $message .= "\n\n$xml";
   my @to = (Param("maintainer"), $maintainer, $exporter);
-  MailMessage ($subject, $message, @to);
+  Mail($subject, $message, @to);
   exit;
 }

@@ -224,7 +219,7 @@
   $message .= "\n\nPlease re-open the original bug.\n";
   $message .= "\n\n$xml";
   my @to = (Param("maintainer"), $maintainer, $exporter);
-  MailMessage ($subject, $message, @to);
+  Mail($subject, $message, @to);
   exit;
 }

@@ -409,7 +404,7 @@
     $message .= "\n\nPlease re-open the original bug.\n";
     $message .= "\n\n$xml";
     my @to = (Param("maintainer"), $maintainer, $exporter);
-    MailMessage ($subject, $message, @to);
+    Mail($subject, $message, @to);
     exit;
   }

@@ -657,4 +652,4 @@
 my $subject = "$bugqty bug(s) successfully moved from $urlbase to "
                . Param("urlbase") ;
 my @to = ($exporter);
-MailMessage ($subject, $log, @to);
+Mail($subject, $log, @to);
Index: move.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/move.pl,v
retrieving revision 1.21
diff -u -r1.21 move.pl
--- move.pl	5 May 2003 01:15:27 -0000	1.21
+++ move.pl	12 Jul 2003 09:07:17 -0000
@@ -33,6 +33,7 @@
 use Bug;
 use Bugzilla;
 use Bugzilla::BugMail;
+use Bugzilla::ProcessMail;

 $::lockcount = 0;

@@ -146,13 +147,6 @@
 $buglist =~ s/:/,/g;
 my $host = Param("urlbase");
 $host =~ s#http://([^/]+)/.*#$1#;
-my $to = Param("move-to-address");
-$to =~ s/@/\@/;
-my $msg = "To: $to\n";
-my $from = Param("moved-from-address");
-$from =~ s/@/\@/;
-$msg .= "From: Bugzilla <" . $from . ">\n";
-$msg .= "Subject: Moving bug(s) $buglist\n\n";

 my @fieldlist = (Bug::fields(), 'group', 'long_desc', 'attachment');
 my %displayfields;
@@ -160,19 +154,15 @@
     $displayfields{$_} = 1;
 }

-$template->process("bug/show.xml.tmpl", { user => { login => $exporter },
-                                          bugs => address@hidden,
-                                          displayfields => \%displayfields,
-                                        }, \$msg)
-  || ThrowTemplateError($template->error());
-
-$msg .= "\n";
-
-open(SENDMAIL,
-  "|/usr/lib/sendmail -ODeliveryMode=background -t -i") ||
-    die "Can't open sendmail";
-print SENDMAIL $msg;
-close SENDMAIL;
+my $messageInfo = {};
+$messageInfo->{'envelopeFrom'} = Param('moved-from-address');
+$messageInfo->{'envelopeTo'} = $to;
+$messageInfo->{'user'} = { login => $exporter};
+$messageInfo->{'buglist'} = $buglist;
+$messageInfo->{'bugs'} = address@hidden;
+$messageInfo->{'displayfields'} = \%displayfields;
+
+MailMessage('movebugs', $messageInfo);

 my $logstr = "XML: bugs $buglist sent to $to";
 Log($logstr);
Index: whineatnews.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/whineatnews.pl,v
retrieving revision 1.10
diff -u -r1.10 whineatnews.pl
--- whineatnews.pl	27 Mar 2003 00:06:50 -0000	1.10
+++ whineatnews.pl	12 Jul 2003 09:07:17 -0000
@@ -53,25 +53,14 @@
 }


-my $template = Param('whinemail');
-my $urlbase = Param('urlbase');
-my $emailsuffix = Param('emailsuffix');
-
 foreach my $email (sort (keys %bugs)) {
-    my %substs;
-    $substs{'email'} = $email . $emailsuffix;
-    $substs{'userid'} = $email;
-    my $msg = PerformSubsts($template, \%substs);
+    my $messageInfo = {};
+    $messageInfo->{'envelopeFrom'} = Param('bzmailfrom');
+    $messageInfo->{'envelopeTo'} = $email . Param('emailsuffix');
+    $messageInfo->{'buglist'} = $bugs{$email};
+    $messageInfo->{'userid'} = $email;

-    foreach my $i (@{$bugs{$email}}) {
-        $msg .= "  " . shift(@{$desc{$email}}) . "\n";
-        $msg .= "    -> ${urlbase}show_bug.cgi?id=$i\n";
-    }
+    MailMessage('whinemail', $messageInfo);

-    my $sendmailparam = Param('sendmailnow') ? '' : "-ODeliveryMode=deferred";
-    open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t -i"
-        or die "Can't open sendmail";
-    print SENDMAIL $msg;
-    close SENDMAIL;
     print "$email      " . join(" ", @{$bugs{$email}}) . "\n";
 }
Index: Bugzilla/BugMail.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm,v
retrieving revision 1.6
diff -u -r1.6 BugMail.pm
--- Bugzilla/BugMail.pm	10 Jul 2003 05:24:42 -0000	1.6
+++ Bugzilla/BugMail.pm	12 Jul 2003 09:07:19 -0000
@@ -31,6 +31,7 @@
 package Bugzilla::BugMail;

 use RelationSet;
+use Bugzilla::ProcessMail;

 # This code is really ugly. It was a commandline interface, then it was moved
 # There are package-global variables which we rely on ProcessOneBug to clean
@@ -43,9 +44,6 @@

 my @excludedAddresses = ();

-# disable email flag for offline debugging work
-my $enableSendMail = 1;
-
 my %force;

 my %seen;
@@ -812,8 +810,6 @@

     my $isnew = ($start !~ m/[1-9]/);

-    my %substs;
-
     # If an attachment was created, then add an URL. (Note: the 'g'lobal
     # replace should work with comments with multiple attachments.)

@@ -826,41 +822,20 @@
     }

     $person .= Param('emailsuffix');
-# 09/13/2000 address@hidden
-# If a bug is changed, don't put the word "Changed" in the subject mail
-# since if the bug didn't change, you wouldn't be getting mail
-# in the first place! see http://bugzilla.mozilla.org/show_bug.cgi?id=29820
-# for details.
-    $substs{"neworchanged"} = $isnew ? ' New: ' : '';
-    $substs{"to"} = $person;
-    $substs{"cc"} = '';
-    $substs{"bugid"} = $id;
-    if ($isnew) {
-      $substs{"diffs"} = $head . "\n\n" . $newcomments;
-    } else {
-      $substs{"diffs"} = $difftext . "\n\n" . $newcomments;
-    }
-    $substs{"summary"} = $values{'short_desc'};
-    $substs{"reasonsheader"} = join(" ", @reasons);
-    $substs{"reasonsbody"} = $reasonsbody;
-    $substs{"space"} = " ";
+
+    my $messageInfo = {};

-    my $template = Param("newchangedmail");
+    $messageInfo->{'envelopeTo'} = $person;
+    $messageInfo->{'neworchanged'} = $isnew ? 'New: ' : '';
+    $messageInfo->{'bugid'} = $id;
+    $messageInfo->{'diffs'} = $isnew ? ($head . "\n\n" . $newcomments) :
+     ($difftext . "\n\n" . $newcomments);
+    $messageInfo->{'summary'} = $values{'short_desc'};
+    $messageInfo->{'reasonsheader'} = join(" ", @reasons);
+    $messageInfo->{'reasonsbody'} = $reasonsbody;

-    my $msg = PerformSubsts($template, \%substs);
+    MailMessage('bugactivity', $messageInfo);

-    my $sendmailparam = "-ODeliveryMode=deferred";
-    if (Param("sendmailnow")) {
-       $sendmailparam = "";
-    }
-
-    if ($enableSendMail == 1) {
-        open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t -i") ||
-          die "Can't open sendmail";
-
-        print SENDMAIL trim($msg) . "\n";
-        close SENDMAIL;
-    }
     push(@sentlist, $person);
     return 1;
 }
Index: Bugzilla/Config.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config.pm,v
retrieving revision 1.15
diff -u -r1.15 Config.pm
--- Bugzilla/Config.pm	24 Apr 2003 22:02:35 -0000	1.15
+++ Bugzilla/Config.pm	12 Jul 2003 09:07:20 -0000
@@ -33,6 +33,7 @@
 use base qw(Exporter);

 use Bugzilla::Util;
+use Bugzilla::ProcessMail;

 # Module stuff
 @Bugzilla::Config::EXPORT = qw(Param);
Index: Bugzilla/Flag.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Flag.pm,v
retrieving revision 1.12
diff -u -r1.12 Flag.pm
--- Bugzilla/Flag.pm	3 Jun 2003 09:47:54 -0000	1.12
+++ Bugzilla/Flag.pm	12 Jul 2003 09:07:21 -0000
@@ -18,6 +18,7 @@
 # Rights Reserved.
 #
 # Contributor(s): Myk Melez <address@hidden>
+#                 J. Paul Reed <address@hidden>

 ################################################################################
 # Module Initialization
@@ -34,6 +35,7 @@
 use Bugzilla::Config;
 use Bugzilla::Util;
 use Bugzilla::Error;
+use Bugzilla::ProcessMail;

 use Attachment;

@@ -322,7 +324,7 @@
         && ($flag->{'requestee'}->email_prefs->{'FlagRequestee'}
             || $flag->{'type'}->{'cc_list'}))
     {
-        notify($flag, "request/email.txt.tmpl");
+        notify($flag);
     }
 }

@@ -394,7 +396,7 @@
                 || $flag->{'type'}->{'cc_list'})
             {
                 $flag->{'status'} = $status;
-                notify($flag, "request/email.txt.tmpl");
+                notify($flag);
             }
         }
         elsif ($status eq '?') {
@@ -418,7 +420,7 @@
                 && ($flag->{'requestee'}->email_prefs->{'FlagRequestee'}
                     || $flag->{'type'}->{'cc_list'}))
             {
-                notify($flag, "request/email.txt.tmpl");
+                notify($flag);
             }
         }
         # The user unset the flag, so delete it from the database.
@@ -445,7 +447,7 @@
     # knows why email is being sent about the request.
     $flag->{'status'} = "X";

-    notify($flag, "request/email.txt.tmpl") if $flag->{'requestee'};
+    notify($flag) if $flag->{'requestee'};
 }


@@ -552,7 +554,7 @@
 sub notify {
     # Sends an email notification about a flag being created or fulfilled.

-    my ($flag, $template_file) = @_;
+    my ($flag) = @_;

     # If the target bug is restricted to one or more groups, then we need
     # to make sure we don't send email about it to unauthorized users
@@ -577,21 +579,32 @@
         $flag->{'type'}->{'cc_list'} = join(", ", @new_cc_list);
     }

-    $::vars->{'flag'} = $flag;
-
-    my $message;
-    my $rv =
-      $::template->process($template_file, $::vars, \$message);
-    if (!$rv) {
-        Bugzilla->cgi->header();
-        &::ThrowTemplateError($::template->error());
-    }
-
-    my $delivery_mode = Param("sendmailnow") ? "" : "-ODeliveryMode=deferred";
-    open(SENDMAIL, "|/usr/lib/sendmail $delivery_mode -t -i")
-      || die "Can't open sendmail";
-    print SENDMAIL $message;
-    close(SENDMAIL);
+    my $messageInfo = {};
+    # XXX - Bugzilla-request-daemon, originally
+    $messageInfo->{'envelopeFrom'} = Param('bzmailfrom');
+
+    # Create the To: header
+    if ($flag->{'status'} eq '?') {
+        ## XXX - We're ignoring a pref here; need to ask what to do if the
+        ## pref isn't set...
+        $messageInfo->{'envelopeTo'} = $flag->{'requestee'}->{'email'};
+        $messageInfo->{'toIdentity'} = $flag->{'requestee'}->{'identity'};
+        $messageInfo->{'subject'} = 'requested';
+    }
+    else {
+        $messageInfo->{'envelopeTo'} = $flag->{'setter'}->{'email'};
+        $messageInfo->{'to_identity'} = $flag->{'setter'}->{'identity'} .
+         "'s request";
+        $messageInfo->{'subject'} = $flag->{'status'};
+    }
+
+    # XXX - Still need to setup handling of the CC list
+    $messageInfo->{'flag'} = $flag;
+    $messageInfo->{'form'} = \%::FORM;
+    # XXX - Is this right? -jpr
+    $messageInfo->{'user'} = new Bugzilla::User($::userid);
+
+    MailMessage('flag-email', $messageInfo);
 }

 ################################################################################
Index: Bugzilla/ProcessMail.pm
===================================================================
RCS file: Bugzilla/ProcessMail.pm
diff -N Bugzilla/ProcessMail.pm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Bugzilla/ProcessMail.pm	12 Jul 2003 09:07:22 -0000
@@ -0,0 +1,284 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# 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 Mail subsystem.
+#
+# The Initial Developer of the Original Code is J. Paul Reed.
+# Copyright (C) 2003 J. Paul Reed. All Rights Reserved.
+#
+# Contributor(s):
+#
+
+package Bugzilla::ProcessMail;
+
+##
+## Do NOT |use Bugzilla;| or |use Bugzilla::Config;|! Doing so causes
+## a circular depedancy in defparams and causes stuff to blow up. This is why
+## you'll see Bugzilla::Config::Param() all over the place here instead of
+## the usual Param();
+##
+use Bugzilla::Util;
+
+use base qw(Exporter);
address@hidden = qw(MailMessage GetMailModuleList %MailModuleParamCheckers);
+
+use strict;
+
+## Available modules and their param checker functions
+my %MailModules = (
+   'sendmail' => \&Bugzilla::ProcessMail::DoSendmailMailing,
+   'netsmtp' => \&Bugzilla::ProcessMail::DoNetSMTPMailing,
+   'debug' => \&Bugzilla::ProcessMail::DoDebugMailing,
+);
+
+my %ModuleParamCheckers = (
+   'sendmail' => \&Bugzilla::ProcessMail::CheckSendmailParams,
+   'netsmtp' => \&Bugzilla::ProcessMail::CheckNetSMTPParams,
+   'debug' => \&Bugzilla::ProcessMail::CheckDebugParams,
+);
+
+sub GetMailModuleList {
+   return keys %MailModules;
+}
+
+## List of required headers/fields for *each* message; pretty short for now
+my @ReqdMsgHashFields = ('envelopeFrom', 'envelopeTo');
+
+## The passed in message hash contains template/email message-specific
+## content; the template will ensure it gets what it needs. BUT, all msgHashs
+## MUST have:
+##   -- 'envelopeTo' (the recipient)
+##
+## *IF* bugmailfrom is 'fromuser', then we also MUST HAVE:
+##   -- 'envelopeFrom' (the sender)
+##
+
+sub MailMessage {
+    my ($tmplName, $msgHash) = @_;
+    my $module = Bugzilla::Config::Param('mailmodule');
+
+    ## Do nothing if email delivery is turned off site-wide
+    return if (!Bugzilla::Config::Param('emaildelivery'));
+
+    ## Get the singleton mail template (separate from the output template; see
+    ## the note in Bugzilla.pm) and the global vars hash (using it should
+    ## be ok)
+    my $template = Bugzilla->mail_template;
+    my $vars = $::vars;
+
+    ## Do we need/have a From:?
+    $msgHash->{'envelopeFrom'} = Bugzilla::Config::Param('bzmailfrom') if
+     (!exists($msgHash->{'envelopeFrom'}) &&
+     Bugzilla::Config::Param('bugmailfrom') eq 'fromserver');
+
+    ## Did they fill in all the required fields
+    foreach my $field (@ReqdMsgHashFields) {
+        if (!exists($msgHash->{"$field"}) || trim($msgHash->{"$field"}) eq '') {
+            ::ThrowCodeError('missing_mailhash_entry', { missing => $field });
+        }
+    }
+
+    ## Set our From: and To: (same as the envelope From:/To: for now)
+    my $from = $msgHash->{'headerfrom'} = $msgHash->{'envelopeFrom'};
+    my $to = $msgHash->{'headerto'} = $msgHash->{'envelopeTo'};
+
+    $msgHash->{'messageSendTime'} = time();
+
+    ## attach the msg hash to TT
+    $vars->{'emailmsg'} = $msgHash;
+
+    ## Use TT to build a set of headers and a body
+    my $header;
+    my $body;
+
+    my $emailHeaderTemplate = 'email/' . $tmplName . '-header.txt.tmpl';
+    my $emailMessageTemplate = 'email/' . $tmplName . '.txt.tmpl';
+
+    ## Process the message header
+    $template->process($emailHeaderTemplate, $vars, \$header)
+     || ::ThrowTemplateError($template->error());
+
+    ## Process the message body; actual message gets created here
+    $template->process($emailMessageTemplate, $vars, \$body)
+     || ::ThrowTemplateError($template->error());
+
+    if (! $MailModules{"$module"}->($from, $to, $header, $body)) {
+        ::ThrowCodeError('mail_send_failed', { from => $from, to => $to,
+         header =>$header, body => $body });
+    }
+
+    return 1;
+}
+
+sub CheckMailModuleParams {
+    my ($newModuleArgs, $paramHash) = @_;
+
+    ## This is kinda hacky, and relies on the fact that if the mailmodule
+    ## param changed, it was set with SetParam (??) BEFORE the mailmodargs
+    ## param is checked here; otherwise, we'll be checking the wrong param
+    ## with the the wrong module.
+
+    my $module = Bugzilla::Config::Param('mailmodule');
+
+    return "Invalid mail module '$module' selected " if
+     (!exists($MailModules{"$module"}) ||
+      !exists($ModuleParamCheckers{"$module"}) ||
+      ref($MailModules{"$module"}) ne 'CODE'  ||
+      ref($ModuleParamCheckers{"$module"}) ne 'CODE');
+
+    return $ModuleParamCheckers{"$module"}->($newModuleArgs);
+}
+
+
+##
+## "Modules" to send the mail
+##
+## To add a "module", create a sub that will handle the mail the way you
+## want; it will be passed, in order:
+##  -- An envelope From: address
+##  -- An envelope To: address
+##  -- The message's headers
+##  -- The message's body
+##
+## Finally, add a key->value pair that is the name of the "module" and a CODE
+## reference to a function that does the mailing to %MailModules up top and
+## the name of the "module" and a CODE reference to the module's param
+## validator (for Bugzilla::Config/defparams to use) to %ModuleParamCheckers
+## up top. Presto... instant new mail handling module.
+##
+## Officially Bugzilla.org-supported module implementations follow.
+##
+
+##
+## Send mail the "old" sendmail way (deprecated)...
+##
+
+sub DoSendmailMailing {
+    my ($envFrom, $envTo, $msgHeaders, $msgBody) = @_;
+    my $sendmailExecutable = Bugzilla::Config::Param('mailmodargs');
+
+    open(SENDMAIL, "|$sendmailExecutable") or
+     ::ThrowCodeError('sendmail_mailing_failed', { openrv => $! } );
+    print SENDMAIL "$msgHeaders\n\n";
+    print SENDMAIL "$msgBody\n";
+    close(SENDMAIL);
+
+    return 1;
+}
+
+sub CheckSendmailParams {
+    my $newArg = shift;
+
+    my $executable = $newArg;
+    $executable =~ s/^(\S+)(.*)$/$1/;
+
+    (-x $executable)
+     || return "Specified Sendmail binary ($executable) doesn't exist or " .
+     "isn't executable";
+
+    return "Use full path to sendmail (start with '/', no '..')"
+     if ($newArg =~ /\.\.?/ || $newArg !~ /^\//);
+
+    ## Other than the checks above, we assume the admin knows what they're
+    ## doing; probably stupid, but we can't constrain them too much...
+    trick_taint($newArg);
+    my $rv = open(SENDMAIL, "|$newArg");
+    close(SENDMAIL);
+
+    return "open() of sendmail via '$newArg' failed: $rv ($!)" if (!$rv);
+    return '';
+}
+
+##
+## Send mail with perl's Net::SMTP (default method)
+##
+
+my $smtpTimeout = 15; # Change to 15 seconds from the default of 120 so the
+                      # webpage doesn't get stalled for too long
+
+sub DoNetSMTPMailing {
+    my ($envFrom, $envTo, $msgHeaders, $msgBody) = @_;
+
+    require Net::SMTP;
+
+    my $smtphost = Bugzilla::Config::Param('mailmodargs');
+    my $smtp = Net::SMTP->new($smtphost, Hello => '', Timeout => $smtpTimeout)
+     or return;
+
+    $smtp->mail("$envFrom");
+    $smtp->to("$envTo");
+
+    $smtp->data();
+    $smtp->datasend($msgHeaders);
+    $smtp->datasend("\n\n");
+    $smtp->datasend($msgBody);
+    my $rv = $smtp->dataend();
+    # XXX - Cache the SMTP handle instead of throwing it away with quit()
+    $smtp->quit();
+
+    return $rv;
+}
+
+sub CheckNetSMTPParams {
+    my $newArg = shift;
+    require Net::SMTP;
+
+    ## We trust the new hostname given to us because an admin is giving it to
+    ## us and the Net::Cmd is robust enough to handle weird input if someone's
+    ## trying to do something stupid.
+    trick_taint($newArg);
+    my $smtp = Net::SMTP->new($newArg, Timeout => $smtpTimeout)
+     or return "Couldn't connect to SMTP server '$newArg'";
+
+    my $rv;
+    $rv = $smtp->banner();
+    $smtp->quit();
+
+    return "Failed to get response from server '$newArg'" if
+     ($rv eq undef);
+    return '';
+}
+
+##
+## Mailing Debug target
+##
+
+sub DoDebugMailing {
+    my ($envFrom, $envTo, $msgHeaders, $msgBody) = @_;
+    my $mailDebugFile = Bugzilla::Config::Param('mailmodargs');
+
+    ## Normally, we'd return 0 to indicate failure, but since we're debugging
+    ## let's REALLY die().
+
+    open(MAILDBUG, ">>$mailDebugFile") or
+     ::ThrowCodeError('debug_mailing_failed', { openrv => $! } );
+
+    print MAILDBUG "--- " . scalar(localtime(time())) . " ---\n";
+    print MAILDBUG "ENVELOPE_FROM: $envFrom\n";
+    print MAILDBUG "ENVELOPE_TO: $envTo\n";
+    print MAILDBUG "HEADERS:\n$msgHeaders\n\n";
+    print MAILDBUG "BODY:\n$msgBody\n\n\n";
+    close(MAILDBUG);
+
+    return 1;
+}
+
+sub CheckDebugParams {
+    my $newArg = shift;
+    my $mailDebugFile = $newArg;
+    my $rv = open(MAILDBUG, ">>$mailDebugFile");
+    close(MAILDBUG);
+    return "Failed to open '$mailDebugFile' for append" if (!$rv);
+    return '';
+}
+
+1;
Index: template/en/default/account/cancel-token.txt.tmpl
===================================================================
RCS file: template/en/default/account/cancel-token.txt.tmpl
diff -N template/en/default/account/cancel-token.txt.tmpl
--- template/en/default/account/cancel-token.txt.tmpl	3 Jul 2003 21:31:16 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,98 +0,0 @@
-[%# address@hidden %]
-[%# 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):     John Vandenberg <address@hidden>
-  #                     Tobias Burnus <address@hidden>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-From: bugzilla-admin-daemon
-To: [% emailaddress %]
-Subject: [% PROCESS subject %]
-
-A request was cancelled from [% remoteaddress %].
-
-If you did not request this, it could be either an honest
-mistake or someone attempting to break into your [% terms.Bugzilla %] account.
-
-Take a look at the information below and forward this email
-to [% maintainer %] if you suspect foul play.
-
-            Token: [% token %]
-       Token Type: [% tokentype %]
-             User: [% emailaddress %]
-       Issue Date: [% issuedate %]
-       Event Data: [% eventdata %]
-Cancelled Because:
-[% PROCESS cancelactionmessage %]
-
-[% BLOCK subject %]
-  [% IF tokentype == 'password' %]
-    Password change request cancelled
-  [% ELSIF tokentype == 'emailnew' OR tokentype == 'emailold' %]
-    Email change request cancelled
-  [% ELSE %]
-    [% tokentype %] token cancelled
-  [% END %]
-[% END %]
-
-[% BLOCK cancelactionmessage %]
-  [% IF    cancelaction == 'account_exists' %]
-    Account [% email %] already exists.
-
-  [% ELSIF cancelaction == 'email_change_cancelled' %]
-    The request to change the email address for the
-    [% old_email %] account to [% new_email %]
-    has been cancelled.
-
-  [% ELSIF cancelaction == 'email_change_cancelled_reinstated' %]
-    The request to change the email address for your account to
-    [% new_email %] has been cancelled. Your old account
-    settings have been reinstated.
-
-  [% ELSIF cancelaction == 'emailold_change_cancelled' %]
-    The request to change the email address for your account
-    to [% new_email %] has been cancelled.
-
-  [% ELSIF cancelaction == 'password_change_canceled' %]
-    You have requested cancellation.
-
-  [% ELSIF cancelaction == 'user_logged_in' %]
-    You have logged in.
-
-  [% ELSIF cancelaction == 'wrong_token_for_changing_passwd' %]
-    You have tried to use the token to change the password.
-
-  [% ELSIF cancelaction == 'wrong_token_for_cancelling_email_change' %]
-    You have tried to use the token to cancel the email address change.
-
-  [% ELSIF cancelaction == 'wrong_token_for_confirming_email_change' %]
-    You have tried to use the token to confirm the email address change.
-
-  [% ELSE %]
-    [%# Give sensible error if the cancel-token function is used incorrectly.
-      #%]
-    You are using [% terms.Bugzilla %]'s cancel-token function incorrectly. You
-    passed in the string '[% cancelaction %]'. The correct use is to pass
-    in a tag, and define that tag in the file cancel-token.txt.tmpl.
-
-    If you are a [% terms.Bugzilla %] end-user seeing this message, please forward this
-    email to [% Param('maintainer') %].
-  [% END %]
-[% END %]
Index: template/en/default/account/email/change-new.txt.tmpl
===================================================================
RCS file: template/en/default/account/email/change-new.txt.tmpl
diff -N template/en/default/account/email/change-new.txt.tmpl
--- template/en/default/account/email/change-new.txt.tmpl	3 Jul 2003 21:31:21 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-[%# address@hidden %]
-[%# 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):     John Vandenberg <address@hidden>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
-To: [% emailaddress %]
-Subject: [% terms.Bugzilla %] Change Email Address Request
-
-[% terms.Bugzilla %] has received a request to change the email address
-for the [% oldemailaddress %] account to your address.
-
-To confirm the change, visit the following link:
-
-[% Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER url_quote %]
-
-If you are not the person who made this request, or you wish to cancel
-this request, visit the following link:
-
-[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %]
-
-If you do nothing, the request will lapse after
-[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
Index: template/en/default/account/email/change-old.txt.tmpl
===================================================================
RCS file: template/en/default/account/email/change-old.txt.tmpl
diff -N template/en/default/account/email/change-old.txt.tmpl
--- template/en/default/account/email/change-old.txt.tmpl	3 Jul 2003 21:31:21 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-[%# address@hidden %]
-[%# 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):     John Vandenberg <address@hidden>
-  #%]
-[%# INTERFACE:
-  # emailaddress: string. The user's old Bugzilla login email address.
-  # newemailaddress: string. The user's new Bugzilla login email address.
-  # token: string. The token associated with this change.
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
-To: [% emailaddress %]
-Subject: [% terms.Bugzilla %] Change Email Address Request
-Importance: High
-X-MSMail-Priority: High
-X-Priority: 1
-
-[% terms.Bugzilla %] has received a request to change the email address
-for your account to [% newemailaddress %].
-
-If you are not the person who made this request, or you wish to cancel
-this request, visit the following link:
-
-[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %]
-
-If you do nothing, and [% newemailaddress %] confirms this request, the
-change will be made permanent after
-[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
Index: template/en/default/account/password/forgotten-password.txt.tmpl
===================================================================
RCS file: template/en/default/account/password/forgotten-password.txt.tmpl
diff -N template/en/default/account/password/forgotten-password.txt.tmpl
--- template/en/default/account/password/forgotten-password.txt.tmpl	3 Jul 2003 21:31:23 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-[%# address@hidden %]
-[%# 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):     John Vandenberg <address@hidden>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
-To: [% emailaddress %]
-Subject:  [% terms.Bugzilla %] Change Password Request
-
-You (or someone impersonating you) has requested to change your [% terms.Bugzilla %]
-&nbsp;password.  To change your password, visit the following link:
-
-[%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %]
-
-If you are not the person who made this request, or you wish to cancel
-this request, visit the following link:
-
-[%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% token FILTER url_quote %]
-
-If you do nothing, the request will lapse after
-[%- max_token_age %] days
-([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you log in successfully.
Index: template/en/default/email/bugactivity-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/bugactivity-header.txt.tmpl
diff -N template/en/default/email/bugactivity-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/bugactivity-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,27 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject="[Bug $emailmsg.bugid] $emailmsg.neworchanged$emailmsg.summary" %]
+X-Bugzilla-Reason: [% emailmsg.reasonsheader %]
Index: template/en/default/email/bugactivity.txt.tmpl
===================================================================
RCS file: template/en/default/email/bugactivity.txt.tmpl
diff -N template/en/default/email/bugactivity.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/bugactivity.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,31 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003
+  # J. Paul Reed. All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; contains information about this message
+  #%]
+[% Param('urlbase') %]show_bug.cgi?id=[% emailmsg.bugid %]
+
+[% emailmsg.diffs %]
+
+--
+Configure bugmail: [% Param('urlbase') %]userprefs.cgi?tab=email
+
+
+[% emailmsg.reasonsbody %]
+
Index: template/en/default/email/cancel-token-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/cancel-token-header.txt.tmpl
diff -N template/en/default/email/cancel-token-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/cancel-token-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,37 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% subject_header = PROCESS 'cancel_token_subject' emailmsg=emailmsg %]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject=subject_header %]
+
+[% BLOCK cancel_token_subject %]
+  [% IF emailmsg.tokentype == 'password' %]
+    Password change request cancelled
+  [% ELSIF tokentype == 'emailnew' OR tokentype == 'emailold' %]
+    Email change request cancelled
+  [% ELSE %]
+    [% emailmsg.tokentype %] token cancelled
+  [% END %]
+[% END %]
Index: template/en/default/email/cancel-token.txt.tmpl
===================================================================
RCS file: template/en/default/email/cancel-token.txt.tmpl
diff -N template/en/default/email/cancel-token.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/cancel-token.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,82 @@
+[%# address@hidden %]
+[%# 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):     John Vandenberg <address@hidden>
+  #                     Tobias Burnus <address@hidden>
+  #                     J. Paul Reed <address@hidden>
+  #%]
+A request was cancelled from [% emailmsg.remoteaddress %].
+
+If you did not request this, it could be either an honest
+mistake or someone attempting to break into your [% terms.Bugzilla %] account.
+
+Take a look at the information below and forward this email
+to [% Param('maintainer') %] if you suspect foul play.
+
+            Token: [% emailmsg.token %]
+       Token Type: [% emailmsg.tokentype %]
+             User: [% emailmsg.emailaddress %]
+       Issue Date: [% emailmsg.issuedate %]
+       Event Data: [% emailmsg.eventdata %]
+Cancelled Because:
+[% PROCESS cancelactionmessage emailmsg=emailmsg %]
+
+[% BLOCK cancelactionmessage %]
+  [% IF    emailmsg.cancelaction == 'account_exists' %]
+    Account [% emailmsg.email %] already exists.
+
+  [% ELSIF emailmsg.cancelaction == 'email_change_cancelled' %]
+    The request to change the email address for the
+    [% emailmsg.old_email %] account to [% emailmsg.new_email %]
+    has been cancelled.
+
+  [% ELSIF cancelaction == 'email_change_cancelled_reinstated' %]
+    The request to change the email address for your account to
+    [% emailmsg.new_email %] has been cancelled. Your old account
+    settings have been reinstated.
+
+  [% ELSIF cancelaction == 'emailold_change_cancelled' %]
+    The request to change the email address for your account
+    to [% emailmsg.new_email %] has been cancelled.
+
+  [% ELSIF cancelaction == 'password_change_canceled' %]
+    You have requested cancellation.
+
+  [% ELSIF cancelaction == 'user_logged_in' %]
+    You have logged in.
+
+  [% ELSIF cancelaction == 'wrong_token_for_changing_passwd' %]
+    You have tried to use the token to change the password.
+
+  [% ELSIF cancelaction == 'wrong_token_for_cancelling_email_change' %]
+    You have tried to use the token to cancel the email address change.
+
+  [% ELSIF cancelaction == 'wrong_token_for_confirming_email_change' %]
+    You have tried to use the token to confirm the email address change.
+
+  [% ELSE %]
+    [%# Give sensible error if the cancel-token function is used incorrectly.
+      #%]
+    You are using [% terms.Bugzilla %]'s cancel-token function incorrectly. You
+    passed in the string '[% emailmsg.cancelaction %]'. The correct use is to
+    pass in a tag, and define that tag in the file email/cancel-token.txt.tmpl.
+
+    If you are a [% terms.Bugzilla %] end-user seeing this message, please forward this
+    email to [% Param('maintainer') %].
+  [% END %]
+[% END %]
Index: template/en/default/email/confirm.html.tmpl
===================================================================
RCS file: template/en/default/email/confirm.html.tmpl
diff -N template/en/default/email/confirm.html.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/confirm.html.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,48 @@
+<!-- address@hidden -->
+[%# 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):     John Vandenberg <address@hidden>
+  #%]
+
+[%# INTERFACE:
+  # token: string. The token to be used in this address change.
+  #%]
+
+[% title = "Confirm Change Email" %]
+[% PROCESS global/header.html.tmpl %]
+
+<p>
+  To change your email address, please enter the old email address:
+</p>
+
+<form method="post" action="token.cgi">
+  <input type="hidden" name="t" value="[% token FILTER html %]">
+  <input type="hidden" name="a" value="chgem">
+  <table>
+    <tr>
+      <th align="right">Old Email Address:</th>
+      <td><input type="text" name="email" size="36"></td>
+    </tr>
+    <tr>
+      <th align="right"> </th>
+      <td><input type="submit" value="Submit"></td>
+    </tr>
+  </table>
+</form>
+
+[% PROCESS global/footer.html.tmpl %]
Index: template/en/default/email/emailchange-new-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/emailchange-new-header.txt.tmpl
diff -N template/en/default/email/emailchange-new-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/emailchange-new-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject="$terms.Bugzilla Change Email Address Request" %]
Index: template/en/default/email/emailchange-new.txt.tmpl
===================================================================
RCS file: template/en/default/email/emailchange-new.txt.tmpl
diff -N template/en/default/email/emailchange-new.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/emailchange-new.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,36 @@
+[%# address@hidden %]
+[%# 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):     John Vandenberg <address@hidden>
+  #                     J. Paul Reed <address@hidden>
+  #%]
+[% expiration_ts = emailmsg.token_ts + (emailmsg.max_token_age * 86400) %]
+[% terms.Bugzilla %] has received a request to change the email address
+for the [% emailmsg.oldemailaddress %] account to your address.
+
+To confirm the change, visit the following link:
+
+[% Param('urlbase') %]token.cgi?a=cfmem&t=[% emailmsg.token FILTER url_quote %]
+
+If you are not the person who made this request, or you wish to cancel
+this request, visit the following link:
+
+[% Param('urlbase') %]token.cgi?a=cxlem&t=[% emailmsg.token FILTER url_quote %]
+
+If you do nothing, the request will lapse after
+[%- emailmsg.max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
Index: template/en/default/email/emailchange-old-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/emailchange-old-header.txt.tmpl
diff -N template/en/default/email/emailchange-old-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/emailchange-old-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,29 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject="$terms.Bugzilla Change Email Address Request" %]
+Importance: High
+X-MSMail-Priority: High
+X-Priority: 1
Index: template/en/default/email/emailchange-old.txt.tmpl
===================================================================
RCS file: template/en/default/email/emailchange-old.txt.tmpl
diff -N template/en/default/email/emailchange-old.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/emailchange-old.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,36 @@
+[%# address@hidden %]
+[%# 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):     John Vandenberg <address@hidden>
+  #                     J. Paul Reed <address@hidden>
+  #%]
+[%# INTERFACE:
+  # emailmsg: hash; information about this email message
+  #%]
+[% expiration_ts = emailmsg.token_ts + (emailmsg.max_token_age * 86400) %]
+[% terms.Bugzilla %] has received a request to change the email address
+for your account to [% emailmsg.newemailaddress %].
+
+If you are not the person who made this request, or you wish to cancel
+this request, visit the following link:
+
+[% Param('urlbase') %]token.cgi?a=cxlem&t=[% emailmsg.token FILTER url_quote %]
+
+If you do nothing, and [% emailmsg.newemailaddress %] confirms this request, the
+change will be made permanent after
+[%- emailmsg.max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
Index: template/en/default/email/flag-email-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/flag-email-header.txt.tmpl
diff -N template/en/default/email/flag-email-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/flag-email-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,40 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" ,
+                '?' => "asked" } %]
+[% BLOCK flag_email_subject %]
+[% IF emailmsg.subject == 'requested' %]
+   [% subject_status = "requested" %]
+[% ELSE %]
+   [% subject_status = statuses.${emailmsg.subject} %]
+[% END %]
+Subject: [% emailmsg.flag.type.name %] [%+ subject_status %]: [[% terms.Bug %]&nbsp;[% emailmsg.flag.target.bug.id %]] [% emailmsg.flag.target.bug.summary %]
+  [%- IF emailmsg.flag.target.attachment.exists %] :
+    [Attachment [% emailmsg.flag.target.attachment.id %]] [% emailmsg.flag.target.attachment.summary %]
+  [% END %]
+[% END %]
+[% flagsubjectheader = PROCESS flag_email_subject emailmsg=emailmsg %]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject=flagsubjectheader %]
Index: template/en/default/email/flag-email.txt.tmpl
===================================================================
RCS file: template/en/default/email/flag-email.txt.tmpl
diff -N template/en/default/email/flag-email.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/flag-email.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,48 @@
+[%# address@hidden %]
+[%# 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):     Myk Melez <address@hidden>
+  #                     Jeff Hedlund <address@hidden>
+  #                     J. Paul Reed <address@hidden>
+  #%]
+[% bugidsummary = emailmsg.flag.target.bug.id _ ': ' _ emailmsg.flag.target.bug.summary %]
+[% attidsummary = emailmsg.flag.target.attachment.id _ ': ' _
+                  emailmsg.flag.target.attachment.summary %]
+[%+ USE wrap -%]
+[%- FILTER bullet = wrap(80) -%]
+
+[% emailmsg.user.identity %] has [% statuses.${emailmsg.flag.status} %] [%+ emailmsg.to_identity %] for [% emailmsg.flag.type.name %]:
+
+[% terms.Bug %]&nbsp;[% bugidsummary %]
+[% END %]
+[%+ Param('urlbase') %]show_bug.cgi?id=[% emailmsg.flag.target.bug.id %]
+[% IF emailmsg.flag.target.attachment.exists %]
+
+[% FILTER bullet = wrap(80) %]
+Attachment [% attidsummary %]
+[%- END %]
+[%+ Param('urlbase') %]attachment.cgi?id=[% emailmsg.flag.target.attachment.id %]&action=edit
+[%- END %]
+[%- FILTER bullet = wrap(80) %]
+
+[% IF emailmsg.form.comment.length > 0 %]
+------- Additional Comments from [% emailmsg.user.identity %]
+[%+ emailmsg.form.comment %]
+[% END %]
+
+[%- END %]
Index: template/en/default/email/forgotten-password-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/forgotten-password-header.txt.tmpl
diff -N template/en/default/email/forgotten-password-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/forgotten-password-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject="$terms.Bugzilla Change Password Request" %]
Index: template/en/default/email/forgotten-password.txt.tmpl
===================================================================
RCS file: template/en/default/email/forgotten-password.txt.tmpl
diff -N template/en/default/email/forgotten-password.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/forgotten-password.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,34 @@
+[%# address@hidden %]
+[%# 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):     John Vandenberg <address@hidden>
+  #%]
+[% expiration_ts = emailmsg.token_ts + (max_token_age * 86400) %]
+You (or someone impersonating you) has requested to change your [% terms.Bugzilla %]
+&nbsp;password.  To change your password, visit the following link:
+
+[%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% emailmsg.token FILTER url_quote %]
+
+If you are not the person who made this request, or you wish to cancel
+this request, visit the following link:
+
+[%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% emailmsg.token FILTER url_quote %]
+
+If you do nothing, the request will lapse after
+[%- max_token_age %] days
+([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you log in successfully.
Index: template/en/default/email/global-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/global-header.txt.tmpl
diff -N template/en/default/email/global-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/global-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,31 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003
+  # J. Paul Reed. All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  #
+  # headerfrom: string; the From: address; isn't (necessarily) related to
+  #   the envelope from address
+  # headerto: string; the To: address; isn't (necessarily) related to
+  #   the envelope to address
+  # subject: string; the Subject: header
+  #
+  #%]
+Date: [% time2str('%a, %d %b %Y %H:%M:%S %Z', emailmsg.messageSendTime) %]
+From: [% headerfrom %]
+To: [% headerto %]
+Subject: [% subject %]
Index: template/en/default/email/importbugs-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/importbugs-header.txt.tmpl
diff -N template/en/default/email/importbugs-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/importbugs-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject=emailmsg.subject %]
Index: template/en/default/email/importbugs.txt.tmpl
===================================================================
RCS file: template/en/default/email/importbugs.txt.tmpl
diff -N template/en/default/email/importbugs.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/importbugs.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,22 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003
+  # J. Paul Reed. All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; contains information about this message
+  #%]
+[% emailmsg.messagebody %]
Index: template/en/default/email/mailpassword-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/mailpassword-header.txt.tmpl
diff -N template/en/default/email/mailpassword-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/mailpassword-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject='Your Bugzilla password.' %]
Index: template/en/default/email/mailpassword.txt.tmpl
===================================================================
RCS file: template/en/default/email/mailpassword.txt.tmpl
diff -N template/en/default/email/mailpassword.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/mailpassword.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,29 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003
+  # J. Paul Reed. All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; contains information about this message
+  #%]
+To use the wonders of Bugzilla, you can login with the following:
+
+ E-mail address: [% emailmsg.login %]
+       Password: [% emailmsg.password %]
+
+ To change your password, go to:
+[% Param('urlbase') %]userprefs.cgi
+
Index: template/en/default/email/movebugs-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/movebugs-header.txt.tmpl
diff -N template/en/default/email/movebugs-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/movebugs-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject="Moving bug(s) $emailmsg.buglist" %]
Index: template/en/default/email/movebugs.txt.tmpl
===================================================================
RCS file: template/en/default/email/movebugs.txt.tmpl
diff -N template/en/default/email/movebugs.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/movebugs.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,92 @@
+[%# address@hidden #%]
+[%# 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 <address@hidden>
+  #
+  #%]
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE bugzilla SYSTEM "[% Param('urlbase') %]bugzilla.dtd">
+
+<bugzilla version="[% VERSION %]"
+          urlbase="[% Param('urlbase') %]"
+          maintainer="[% Param('maintainer') FILTER xml %]"
+[% IF user %]
+          exporter="[% user.login FILTER xml %]"
+[% END %]
+>
+
+[% FOREACH bug = bugs %]
+  [% IF bug.error %]
+    <bug error="[% bug.error FILTER xml %]">
+      <bug_id>[% bug.bug_id FILTER xml %]</bug_id>
+    </bug>
+  [% ELSE %]
+    <bug>
+      [% FOREACH field = bug.fields %]
+        [% IF displayfields.$field %]
+          [%+ PROCESS bug_field %]
+        [% END %]
+      [% END %]
+
+      [%# Now handle 'special' fields #%]
+      [% IF displayfields.group %]
+        [% FOREACH g = bug.groups %]
+          [% NEXT UNLESS g.ison %]
+          <group>[% g.name FILTER xml %]</group>
+        [% END %]
+      [% END %]
+
+      [% IF displayfields.long_desc %]
+        [% FOREACH c = bug.longdescs %]
+          <long_desc>
+            <who>[% c.email FILTER xml %]</who>
+            <bug_when>[% c.time FILTER time FILTER xml %]</bug_when>
+            <thetext>[% c.body FILTER xml %]</thetext>
+          </long_desc>
+        [% END %]
+      [% END %]
+
+      [% IF displayfields.attachment %]
+        [% FOREACH a = bug.attachments %]
+          <attachment>
+            <attachid>[% a.attachid %]</attachid>
+            <date>[% a.date FILTER time FILTER xml %]</date>
+            <desc>[% a.description FILTER xml %]</desc>
+          </attachment>
+        [% END %]
+      [% END %]
+    </bug>
+  [% END %]
+[% END %]
+
+</bugzilla>
+
+[% BLOCK bug_field %]
+  [% FOREACH val = bug.$field %]
+    [%# We need to handle some fields differently. This should become
+      # nicer once we have custfields, and a type attribute for the fields
+      #%]
+    [% IF field == 'reporter' OR field == 'assigned_to' OR
+          field == 'qa_contact' %]
+      [% val = val.email %]
+    [% ELSIF field == 'creation_ts' OR field == 'delta_ts' %]
+      [% val = val FILTER time %]
+    [% END %]
+    <[% field %]>[% val FILTER xml %]</[% field %]>
+  [% END %]
+[% END %]
Index: template/en/default/email/voterremoved-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/voterremoved-header.txt.tmpl
diff -N template/en/default/email/voterremoved-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/voterremoved-header.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+   headerfrom=emailmsg.headerfrom
+   headerto=emailmsg.headerto
+   subject="Bug $emailmsg.bugid - Some or all of your votes have been removed." %]
Index: template/en/default/email/voterremoved.txt.tmpl
===================================================================
RCS file: template/en/default/email/voterremoved.txt.tmpl
diff -N template/en/default/email/voterremoved.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/voterremoved.txt.tmpl	12 Jul 2003 09:07:24 -0000
@@ -0,0 +1,31 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003
+  # J. Paul Reed. All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; contains information about this message
+  #%]
+Some or all of your votes have been removed from bug [% emailmsg.bugid %].
+
+[% emailmsg.votesoldtext %]
+
+[% emailmsg.votesnewtext %]
+
+Reason: [% emailmsg.reason %]
+
+[% Param('urlbase') %]show_bug.cgi?id=[% emailmsg.bugid %]
+
Index: template/en/default/email/whinemail-header.txt.tmpl
===================================================================
RCS file: template/en/default/email/whinemail-header.txt.tmpl
diff -N template/en/default/email/whinemail-header.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/whinemail-header.txt.tmpl	12 Jul 2003 09:07:25 -0000
@@ -0,0 +1,26 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003 J. Paul Reed.
+  # All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; hash containing information about this message
+  #
+  #%]
+[% PROCESS "email/global-header.txt.tmpl"
+     headerfrom=emailmsg.headerfrom
+     headerto=emailmsg.headerto
+     subject='Your Bugzilla buglist needs attention.' %]
Index: template/en/default/email/whinemail.txt.tmpl
===================================================================
RCS file: template/en/default/email/whinemail.txt.tmpl
diff -N template/en/default/email/whinemail.txt.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ template/en/default/email/whinemail.txt.tmpl	12 Jul 2003 09:07:25 -0000
@@ -0,0 +1,63 @@
+[%# 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 J. Paul Reed.
+  # Portions created by J. Paul Reed are Copyright (C) 2003
+  # J. Paul Reed. All Rights Reserved.
+  #
+  # Contributor(s):
+  #
+  # INTERFACE:
+  # emailmsg: hash; contains information about this message
+  #%]
+
+[This e-mail has been automatically generated.]
+
+You have one or more bugs assigned to you in the Bugzilla
+bugsystem ([% Param('urlbase') %]) that require
+attention.
+
+All of these bugs are in the NEW state, and have not been touched
+in [% Param('whinedays') %] days or more.  You need to take a look at them, and
+decide on an initial action.
+
+Generally, this means one of three things:
+
+(1) You decide this bug is really quick to deal with (like, it's INVALID),
+    and so you get rid of it immediately.
+(2) You decide the bug doesn't belong to you, and you reassign it to someone
+    else.  (Hint: if you don't know who to reassign it to, make sure that
+    the Component field seems reasonable, and then use the "Reassign bug to
+    owner of selected component" option.)
+(3) You decide the bug belongs to you, but you can't solve it this moment.
+    Just use the "Accept bug" command.
+
+To get a list of all NEW bugs, you can use this URL (bookmark it if you like!):
+
+   [% Param('urlbase') %]buglist.cgi?bug_status=NEW&assigned_to=[% emailmsg.userid %]
+
+Or, you can use the general query page, at
+[% Param('urlbase') %]query.cgi.
+
+Appended below are the individual URLs to get to all of your NEW bugs that
+haven't been touched for a week or more.
+
+You will get this message once a day until you've dealt with these bugs!
+
+[% IF emailmsg.buglist.size > 0 %]
+  [%+ FOREACH bugid = emailmsg.buglist %]
+  [% bugid %]
+  -> [% Param('urlbase') %]show_bug.cgi?id=[% bugid %]
+  [% END %]
+[% ELSE %]
+Error generating buglist.
+[% END %]
Index: template/en/default/global/code-error.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl,v
retrieving revision 1.29
diff -u -r1.29 code-error.html.tmpl
--- template/en/default/global/code-error.html.tmpl	3 Jul 2003 21:31:50 -0000	1.29
+++ template/en/default/global/code-error.html.tmpl	12 Jul 2003 09:07:25 -0000
@@ -81,6 +81,10 @@
     Charts will not work without the Chart::Lines Perl module being installed.
     Run checksetup.pl for installation instructions.

+  [% ELSIF error == "debug_mail_failed" %]
+    Sending mail with the debug mail target FAILED!
+    open() on [% Param('mailmodargs') %] returned '[% openrv %]'.
+
   [% ELSIF error == "field_type_mismatch" %]
     Cannot seem to handle <code>[% field %]</code>
     and <code>[% type FILTER html %]</code> together.
@@ -181,10 +185,16 @@
   [% ELSIF error == "invalid_output_type" %]
     [% title = "Invalid Output Type" %]
     Invalid output type [% type FILTER html %].
-
+
+  [% ELSIF error == "mail_send_failed" %]
+    Mail sending operation failed; From: was '[% from %], To: was '[% to %]'.
+
   [% ELSIF error == "missing_bug_id" %]
     No [% terms.bug %] ID was given.
-
+
+  [% ELSIF error == 'missing_mailhash_entry' %]
+    Required email message info missing; missing hash entry was: '[% missing %]'
+
   [% ELSIF error == "missing_series_id" %]
     Having inserted a series into the database, no series_id was returned for
     it. Series: [% series.category FILTER html %] /
@@ -207,6 +217,10 @@
     [%+ ELSIF variables.fld == "y" %]the vertical axis
     [%+ ELSIF variables.fld == "z" %]the multiple tables/images
     [%+ ELSE %]a report axis[% END %] field.
+
+  [% ELSIF error == "sendmail_mailing_failed" %]
+    Sending mail with the sendmail mail target FAILED!
+    open() on [% Param('mailmodargs') %] returned '[% openrv %]'.

   [% ELSIF error == "token_generation_error" %]
     Something is seriously wrong with the token generation system.
Index: template/en/default/request/email.txt.tmpl
===================================================================
RCS file: template/en/default/request/email.txt.tmpl
diff -N template/en/default/request/email.txt.tmpl
--- template/en/default/request/email.txt.tmpl	3 Jul 2003 21:32:06 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-[%# address@hidden %]
-[%# 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):     Myk Melez <address@hidden>
-  #                     Jeff Hedlund <address@hidden>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% bugidsummary = flag.target.bug.id _ ': ' _ flag.target.bug.summary %]
-[% attidsummary = flag.target.attachment.id _ ': ' _
-                  flag.target.attachment.summary %]
-[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" ,
-                '?' => "asked" } %]
-[% IF flag.status == '?' %]
-   [% to_email = flag.requestee.email IF flag.requestee.email_prefs.FlagRequestee %]
-   [% to_identity = flag.requestee.identity %]
-   [% subject_status = "requested" %]
-[% ELSE %]
-   [% to_email = flag.setter.email IF flag.setter.email_prefs.FlagRequester %]
-   [% to_identity = flag.setter.identity _ "'s request" %]
-   [% subject_status = statuses.${flag.status} %]
-[% END %]
-From: bugzilla-request-daemon
-To: [% to_email %]
-CC: [% flag.type.cc_list %]
-Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %]&nbsp;[% flag.target.bug.id %]] [% flag.target.bug.summary %]
-[%- IF flag.target.attachment.exists %] :
-  [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]
-
-[%+ USE wrap -%]
-[%- FILTER bullet = wrap(80) -%]
-
-[% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]:
-
-[% terms.Bug %]&nbsp;[% bugidsummary %]
-[% END %]
-[%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %]
-[% IF flag.target.attachment.exists %]
-
-[% FILTER bullet = wrap(80) %]
-Attachment [% attidsummary %]
-[%- END %]
-[%+ Param('urlbase') %]attachment.cgi?id=[% flag.target.attachment.id %]&action=edit
-[%- END %]
-[%- FILTER bullet = wrap(80) %]
-
-[% IF form.comment.length > 0 %]
-------- Additional Comments from [% user.identity %]
-[%+ form.comment %]
-[% END %]
-
-[%- END %]