From 3e11f000416834e4dd994012d8852e8e55251d1f Mon Sep 17 00:00:00 2001 From: "mozilla%colinogilvie.co.uk" <> Date: Wed, 22 Feb 2006 06:36:03 +0000 Subject: Bug 100089: Templatise "passwordmail" email Patch by Emmanuel Seyman ; r=lpsolit; a=justdave --- Bugzilla/BugMail.pm | 14 +++++++---- Bugzilla/Config/MTA.pm | 17 ------------- docs/xml/administration.xml | 19 -------------- template/en/default/admin/params/mta.html.tmpl | 7 ------ template/en/default/email/password.txt.tmpl | 35 ++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 48 deletions(-) create mode 100644 template/en/default/email/password.txt.tmpl diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index f065cb5fc..da4005730 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -32,6 +32,7 @@ use strict; package Bugzilla::BugMail; +use Bugzilla::Error; use Bugzilla::User; use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT $datadir); @@ -793,11 +794,14 @@ sub encode_message_entity { # Send the login name and password of the newly created account to the user. sub MailPassword { my ($login, $password) = (@_); - my $template = Param("passwordmail"); - my $msg = perform_substs($template, - {"mailaddress" => $login . Param('emailsuffix'), - "login" => $login, - "password" => $password}); + my $template = Bugzilla->template; + my $vars = { + mailaddress => $login . Param('emailsuffix'), + login => $login, + password => $password }; + my $msg; + $template->process("email/password.txt.tmpl", $vars, \$msg) + || ThrowTemplateError($template->error()); MessageToMTA($msg); } diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm index 4d2cd6703..d331927db 100644 --- a/Bugzilla/Config/MTA.pm +++ b/Bugzilla/Config/MTA.pm @@ -62,23 +62,6 @@ sub get_param_list { default => 'localhost' }, - { - name => 'passwordmail', - 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', type => 'l', diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml index a32a61a59..935702129 100644 --- a/docs/xml/administration.xml +++ b/docs/xml/administration.xml @@ -168,25 +168,6 @@ - - - passwordmail - - - - Every time a user creates an account, the text of this parameter - (with substitutions) is sent to the new user along with their - password message. - - - - Add any text you wish to the "passwordmail" parameter box. For - instance, many people choose to use this box to give a quick - training blurb about how to use Bugzilla at your site. - - - - movebugs diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl index 37d1d8e86..cb2454d62 100644 --- a/template/en/default/admin/params/mta.html.tmpl +++ b/template/en/default/admin/params/mta.html.tmpl @@ -54,13 +54,6 @@ smtpserver => "The SMTP server address (if using SMTP for mail delivery).", - passwordmail => "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. %anythingelse% gets replaced by the " _ - "definition of that parameter (as defined on this page).", - newchangedmail => "The email that gets sent to people when a $terms.bug changes. Within " _ "this text, %to% gets replaced with the e-mail address of the " _ "person receiving the mail. %bugid% gets replaced by the $terms.bug " _ diff --git a/template/en/default/email/password.txt.tmpl b/template/en/default/email/password.txt.tmpl new file mode 100644 index 000000000..5993a90f5 --- /dev/null +++ b/template/en/default/email/password.txt.tmpl @@ -0,0 +1,35 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Emmanuel Seyman + #%] + +[% PROCESS global/variables.none.tmpl %] + +From: bugzilla-daemon +To: [% mailaddress %] +Subject: Your [% terms.Bugzilla %] password. + +To use the wonders of [% terms.Bugzilla %], you can use the following: + + E-mail address: [% login %] + Password: [% password %] + + To change your password, go to: + [%+ Param("urlbase") %]userprefs.cgi + -- cgit v1.2.3-24-g4f1b