Fix for bug 23067: Allow the user to change their email address through the preferences. Sends out tokens in email to both

addresses which have to be confirmed by the new address, and can be cancelled by the old one.  Entering your password on the
preferences page is required to initiate the process.
Patch by John Vandenberg <zeroJ@null.net>
r= myk, justdave

2 files changed, 52 insertions, 4 deletions

diff --git a/template/default/prefs/account.tmpl b/template/default/prefs/account.tmpl
index 486aba082..e436d07a5 100644
--- a/template/default/prefs/account.tmpl
+++ b/template/default/prefs/account.tmpl
@@ -21,17 +21,27 @@
 [%# INTERFACE:
   # realname: string. The user's real name, if any.
   # login:    string. The user's Bugzilla login email address.
+  # login_change_date: string. The date the email change will be complete. (optional)
+  # new_login_name:    string. The user's new Bugzilla login whilst not confirmed. (optional)
   #%]
 
 <table>
   <tr>
-    <th align="right">Old password:</th>
+    <td colspan="3">
+      Please enter your existing password to confirm account changes.
+    </td>
+  </tr>
+  <tr>
+    <th align="right">Password:</th>
     <td>
       <input type="hidden" name="Bugzilla_login" 
              value="[% login FILTER html %]" />
-      <input type="password" name="Bugzilla_password" />  
+      <input type="password" name="Bugzilla_password" />
     </td>
   </tr>              
+  <tr>
+    <td colspan="2"><hr></td>
+  </tr>
 
   <tr>
     <th align="right">New password:</th>
@@ -53,4 +63,36 @@
       <input size="35" name="realname" value="[% realname FILTER html %]" />
     </td>
   </tr>  
+
+  [% IF Param('allowemailchange') %]
+    [% IF login_change_date %]
+      [% IF new_login_name %]
+        <tr>
+          <th align="right">Pending email address:</th>
+          <td>[% new_login_name %]</td>
+        </tr>
+        <tr>
+          <th align="right">Change request expires:</th>
+          <td>[% login_change_date %]</td>
+        </tr>
+      [% ELSE %]
+        <tr>
+          <th align="right">Confirmed email address:</th>
+          <td>[% login FILTER html %]
+        </tr>
+        <tr>
+          <th align="right">Completion date:</th>
+          <td>[% login_change_date %]</td>
+        </tr>
+      [% END %]
+    [% ELSE %]
+      <tr>
+        <th align="right">New email address:</th>
+        <td>
+          <input size="35" name="new_login_name">
+        </td>
+      </tr>
+    [% END %]
+  [% END %]
+  
 </table>
diff --git a/template/default/prefs/userprefs.tmpl b/template/default/prefs/userprefs.tmpl
index 136dcda07..91bb4f027 100644
--- a/template/default/prefs/userprefs.tmpl
+++ b/template/default/prefs/userprefs.tmpl
@@ -29,8 +29,9 @@
   # and its interface must be fulfilled.
   # current_tab: A direct reference to one of the hashes in the tabs list.
   #              This tab will be displayed.
-  # changes_saved: boolean. True if the CGI processed form data before 
-  #                displaying anything.
+  # changes_saved: boolean/string. True if the CGI processed form data before 
+  #                displaying anything, and can contain an optional custom
+  #                message if required (which Perl still evaluates as True).
   #%]
  
 [% INCLUDE global/header
@@ -75,6 +76,11 @@
       [% current_tab.description FILTER lower %] have been saved.
     </font>
   </p>
+  [% IF changes_saved != 1 %]
+    <p>
+      [% changes_saved %]
+    </p>
+  [% END %]
 [% END %]
 
 <h3>[% current_tab.description %]</h3>