From d6d056f9755dea6b2c36779347be9fd03ff7eab0 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Wed, 30 Jan 2013 17:21:16 +0100
Subject: Bug 272407: Send an e-mail when the administrator creates a new
 account for a user r/a=LpSolit

---
 editusers.cgi                                      | 10 +++++++
 template/en/default/admin/users/userdata.html.tmpl |  9 +++++++
 .../en/default/email/new-user-details.txt.tmpl     | 31 ++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 template/en/default/email/new-user-details.txt.tmpl

diff --git a/editusers.cgi b/editusers.cgi
index 66871e413..e12fc35b6 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -21,6 +21,7 @@ use Bugzilla::Flag;
 use Bugzilla::Field;
 use Bugzilla::Group;
 use Bugzilla::Token;
+use Bugzilla::Mailer;
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
@@ -218,6 +219,15 @@ if ($action eq 'search') {
 
     delete_token($token);
 
+    if ($cgi->param('notify_user')) {
+        $vars->{'new_user'} = $new_user;
+        my $message;
+      
+        $template->process('email/new-user-details.txt.tmpl', $vars, \$message)
+            || ThrowTemplateError($template->error());
+        MessageToMTA($message);
+    }
+
     # We already display the updated page. We have to recreate a token now.
     $vars->{'token'} = issue_session_token('edit_user');
     $vars->{'message'} = 'account_created';
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index ae952d151..e42ee6438 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -107,3 +107,12 @@
     </td>
   </tr>
 [% END %]
+[% UNLESS editform %]
+  <tr>
+    <th><label for="notify_user">Notify User:</label></th>
+    <td>
+      <input type="checkbox" name="notify_user" id="notify_user" value="1">
+      (Email this user their account information. The password will not be included.)
+    </td>
+  </tr>
+[% END %]
diff --git a/template/en/default/email/new-user-details.txt.tmpl b/template/en/default/email/new-user-details.txt.tmpl
new file mode 100644
index 000000000..b1b43caf2
--- /dev/null
+++ b/template/en/default/email/new-user-details.txt.tmpl
@@ -0,0 +1,31 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # new_user: The Bugzilla::User object of the user being created
+  #%]
+
+From: [% Param('mailfrom') %]
+To: [% new_user.email %]
+Subject: [% terms.Bugzilla %]: New account created
+X-Bugzilla-Type: admin
+
+[This e-mail has been automatically generated]
+
+A new [% terms.Bugzilla %] user account has been created at [% urlbase %]:
+
+Login: [% new_user.login %]
+[% IF new_user.realname %]
+Real name: [% new_user.realname %]
+[% END %]
+
+For security reasons, we have not included your new password in this e-mail.
+If you have not being given it via other means, you can use the 'Forgot
+Password' link to set a new password.
+
+If you have any issues regarding your account, please contact [% Param('maintainer') %].
-- 
cgit v1.2.3-24-g4f1b