Better text when adding an email address for an OpenID account with no
previous address.
Patch by denise.
diffs (85 lines):
diff -r cd17b371f2b9 -r d12eef88e5a3 htdocs/changeemail.bml
--- a/htdocs/changeemail.bml Thu Jul 02 02:05:46 2009 +0000
+++ b/htdocs/changeemail.bml Thu Jul 02 02:44:30 2009 +0000
@@ -142,7 +142,6 @@ body<=
LJ::update_user($u, $tochange);
-warn "send email to old address: $old_email";
# send letter to old email address
my @date = localtime(time);
LJ::send_mail({
@@ -162,22 +161,37 @@ warn "send email to old address: $old_em
sitelink => $LJ::SITEROOT,
datetime => sprintf("%02d:%02d
%02d/%02d/%04d", @date[2,1], $date[3], $date[4]+1, $date[5]+1900),
}),
- });
-warn "send email to new address: $POST{'email'}";
+ }) unless $is_identity_no_email;
+
# send validation mail
my $aa = LJ::register_authaction($u->{'userid'}, "validateemail",
$POST{'email'});
- LJ::send_mail({
+ if ($is_identity_no_email) {
+ LJ::send_mail({
'to' => $POST{'email'},
'from' => $LJ::ADMIN_EMAIL,
'fromname' => $LJ::SITENAME,
'charset' => 'utf-8',
- 'subject' => $ML{'.newemail.subject'},
- 'body' => BML::ml('.newemail.body2',
+ 'subject' => $ML{'.newemail.subject.openid'},
+ 'body' => BML::ml('.newemail.body.openid',
{ username => $u->display_username,
sitename => $LJ::SITENAME,
sitelink => $LJ::SITEROOT,
conflink =>
"$LJ::SITEROOT/confirm/$aa->{'aaid'}.$aa->{'authcode'}" }),
- });
+ });
+ } else {
+ LJ::send_mail({
+ 'to' => $POST{'email'},
+ 'from' => $LJ::ADMIN_EMAIL,
+ 'fromname' => $LJ::SITENAME,
+ 'charset' => 'utf-8',
+ 'subject' => $ML{'.newemail.subject'},
+ 'body' => BML::ml('.newemail.body2',
+ { username => $u->display_username,
+ sitename => $LJ::SITENAME,
+ sitelink => $LJ::SITEROOT,
+ conflink =>
"$LJ::SITEROOT/confirm/$aa->{'aaid'}.$aa->{'authcode'}" }),
+ });
+ }
$body = "<?h1 $ML{'.success.header'} h1?><?p $ML{'.success.text'} p?>";
} else {
diff -r cd17b371f2b9 -r d12eef88e5a3 htdocs/changeemail.bml.text
--- a/htdocs/changeemail.bml.text Thu Jul 02 02:05:46 2009 +0000
+++ b/htdocs/changeemail.bml.text Thu Jul 02 02:44:30 2009 +0000
@@ -36,6 +36,17 @@ Regards,
[[sitelink]]
.
+.newemail.body.openid<<
+You have just entered an email address for your OpenID account "[[username]]"
at [[sitename]]. To validate this address, please go to:
+
+[[conflink]]
+
+Regards,
+[[sitename]] Team
+[[sitelink]]
+.
+
+
.newemail_old.body2<<
Someone just changed the e-mail address for your [[sitename]] account
"[[username]]".
ip: [[ip]]
@@ -52,6 +63,8 @@ Regards,
.newemail_old.subject=E-mail Address Changed
+.newemail.subject.openid=Email Address Added
+
.newemail.subject=Email Address Changed
.noemail=(None)
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
