Add the new email address to the email sent to you to:
        * register.bml after validating an address
        * the email sent by register.bml if you request a new validation email
        * the validation email sent by changeemail.bml if you change your 
address


        Patch by denise. 

diffs (116 lines):

diff -r 9a5a4786176f -r 7aa1a54b2b1e bin/upgrading/en.dat
--- a/bin/upgrading/en.dat      Sat Jul 11 07:13:03 2009 +0000
+++ b/bin/upgrading/en.dat      Sat Jul 11 07:47:18 2009 +0000
@@ -2573,6 +2573,12 @@ setting.display.accountstatus.option.rea
 
 setting.display.accountstatus.option.suspended=Suspended
 
+setting.display.accounttype.label=Account Type
+
+setting.display.accounttype.upgrade=Upgrade
+
+setting.display.accounttype.status=[[status]], expiring [[exptime]]
+
 setting.display.banusers.label=Ban and Unban Users
 
 setting.display.banusers.option.comm=Ban and unban users from commenting in my 
community
diff -r 9a5a4786176f -r 7aa1a54b2b1e htdocs/changeemail.bml
--- a/htdocs/changeemail.bml    Sat Jul 11 07:13:03 2009 +0000
+++ b/htdocs/changeemail.bml    Sat Jul 11 07:47:18 2009 +0000
@@ -185,8 +185,9 @@ body<=
                 'fromname' => $LJ::SITENAME,
                 'charset' => 'utf-8',
                 'subject' => $ML{'.newemail.subject'},
-                'body' => BML::ml('.newemail.body2',
+                'body' => BML::ml('.newemail.body3',
                                   { username => $u->display_username,
+                                    email => $u->email_raw,
                                     sitename => $LJ::SITENAME,
                                     sitelink => $LJ::SITEROOT,
                                     conflink => 
"$LJ::SITEROOT/confirm/$aa->{'aaid'}.$aa->{'authcode'}" }),
diff -r 9a5a4786176f -r 7aa1a54b2b1e htdocs/changeemail.bml.text
--- a/htdocs/changeemail.bml.text       Sat Jul 11 07:13:03 2009 +0000
+++ b/htdocs/changeemail.bml.text       Sat Jul 11 07:47:18 2009 +0000
@@ -26,14 +26,18 @@
 
 .label.username=Username:
 
-.newemail.body2<<
-You have just changed the email address for your [[sitename]] account 
"[[username]]".  To validate the change, please go to this address:
+.newemail.body3<<
+You have changed the address for your [[sitename]] account "[[username]]" to 
this address: [[email]].
 
-[[conflink]]
+To finish confirming your email address, please visit this URL:
 
-Regards,
+    [[conflink]]
+
+You may have to copy and paste this link into your browser's window.
+
+Sincerely,
 [[sitename]] Team
-[[sitelink]]
+[[siteroot]]
 .
 
 .newemail.body.openid<<
diff -r 9a5a4786176f -r 7aa1a54b2b1e htdocs/register.bml
--- a/htdocs/register.bml       Sat Jul 11 07:13:03 2009 +0000
+++ b/htdocs/register.bml       Sat Jul 11 07:47:18 2009 +0000
@@ -58,9 +58,11 @@ body<=
          'fromname' => $LJ::SITENAME,
          'charset' => 'utf-8',
          'subject' => $ML{'.email.subject'},
-         'body' => BML::ml('.email.body',
+         'body' => BML::ml('.email.body2',
                            { 'sitename' => $LJ::SITENAME,
                              'siteroot' => $LJ::SITEROOT,
+                             'email' => $u->email_raw,
+                             'username' => $u->display_name,
                              'conflink' => 
"$LJ::SITEROOT/confirm/$aa->{'aaid'}.$aa->{'authcode'}" }),
      });
 
@@ -113,7 +115,7 @@ body<=
      } else {
          $title = BML::ml('.new.title', {'sitename' => $LJ::SITENAMESHORT});
          $ret .= "<div class='columns-2-r300'>\n";
-         $ret .= "<?warningbar " . BML::ml('.new.bodyuser', 
{'user'=>LJ::ljuser($u)}) . " warningbar?>";
+         $ret .= "<?warningbar " . BML::ml('.new.bodyuser2', 
{'user'=>LJ::ljuser($u), 'address' => $u->email_raw }) . " warningbar?>";
          $ret .= "<div class='columns-2-left'>";
          $ret .= "<h2 class='widget-header' style='margin-top: 10px;'>" . 
BML::ml('.new.101.title', {'sitename' => $LJ::SITENAMESHORT}) . "</h2><br />";
          $ret .= "<p><strong><a href='" . $u->journal_base . 
"/'>$ML{'.new.101.journal.question'}</a></strong><br />";
diff -r 9a5a4786176f -r 7aa1a54b2b1e htdocs/register.bml.text
--- a/htdocs/register.bml.text  Sat Jul 11 07:13:03 2009 +0000
+++ b/htdocs/register.bml.text  Sat Jul 11 07:47:18 2009 +0000
@@ -11,16 +11,17 @@
 
 .asterisk.name=* [[journal]]
 
-.email.body<<
-This is the validation email you have requested.
-To complete validating your account, please visit this URL:
+.email.body2<<
+You have changed the address for your [[sitename]] account "[[username]]" to 
this address: [[email]].
+
+To finish confirming your email address, please visit this URL:
 
     [[conflink]]
 
 You may have to copy and paste this link into your browser's window.
 
 Sincerely,
-[[sitename]]
+[[sitename]] Team
 [[siteroot]]/
 .
 
@@ -60,7 +61,7 @@ Sincerely,
 
 .new.101.title=[[sitename]] 101
 
-.new.bodyuser=Thanks!  The email address for [[user]] has now been verified.  
Now that you're registered, what to do first?
+.new.bodyuser2=Thanks!  The email address [[address]] for [[user]] has now 
been verified.  Now that you're registered, what to do first?
 
 .new.title=Welcome to [[sitename]]
 
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog

Reply via email to