kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2012-01-31 03:51 pm

[dw-free] Support notifications should have the username in them

[commit: http://hg.dwscoalition.org/dw-free/rev/139ce6219023]

http://bugs.dwscoalition.org/show_bug.cgi?id=4176

This patch was committed prematurely and needs further revision.

Patch by [personal profile] kareila.

Files modified:
  • bin/upgrading/en.dat
  • cgi-bin/LJ/Support.pm
--------------------------------------------------------------------------------
diff -r 662783e34f29 -r 139ce6219023 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Tue Jan 31 15:30:25 2012 +0800
+++ b/bin/upgrading/en.dat	Tue Jan 31 09:52:41 2012 -0600
@@ -3724,12 +3724,11 @@
 
 support.email.fromname=[[sitename]] Support
 
-support.email.notif.new.body2<<
+support.email.notif.new.body<<
 A [[sitename]] support request has been submitted regarding the following:
 
 Category: [[category]]
 Subject: [[subject]]
-User: [[username]]
 URL: [[url]]
 Text:
 
@@ -3748,12 +3747,11 @@
 
 .
 
-support.email.notif.update.body2<<
+support.email.notif.update.body<<
 A follow-up to the following [[sitename]] support request has been submitted:
 
 Category: [[category]]
 Subject: [[subject]]
-User: [[username]]
 URL: [[url]]
 Text:
 
diff -r 662783e34f29 -r 139ce6219023 cgi-bin/LJ/Support.pm
--- a/cgi-bin/LJ/Support.pm	Tue Jan 31 15:30:25 2012 +0800
+++ b/cgi-bin/LJ/Support.pm	Tue Jan 31 09:52:41 2012 -0600
@@ -1052,20 +1052,11 @@
     my $body;
     my @emails;
 
-    my $show_name = $sp->{reqname};
-    my $show_email = $sp->{reqemail};
-    $show_email =~ s/^.+\@/********\@/;
-    if ( $sp->{reqtype} eq 'user' ) {
-        my $u = LJ::load_userid( $sp->{requserid} );
-        $show_name = $u->display_name if $u;
-    }
-
     if ($type eq 'new') {
-        $body = LJ::Lang::ml( "support.email.notif.new.body2", {
+        $body = LJ::Lang::ml( "support.email.notif.new.body", {
                 category => $sp->{_cat}{catname},
                 subject => $sp->{subject},
                 url => "$LJ::SITEROOT/support/see_request?id=$spid",
-                username => LJ::trim( "$show_name ($show_email)" ),
                 text => $sp->{body}
             } );
         $body .= "\n\n" . "="x4 . "\n\n";
@@ -1088,11 +1079,10 @@
                                   undef, $sp->{spid}, $a->{splid}+0);
 
         # build body
-        $body = LJ::Lang::ml( "support.email.notif.update.body2", {
+        $body = LJ::Lang::ml( "support.email.notif.update.body", {
                 category => $sp->{_cat}{catname},
                 subject => $sp->{subject},
                 url => "$LJ::SITEROOT/support/see_request?id=$spid",
-                username => LJ::trim( "$show_name ($show_email)" ),
                 text => $resp
             } );
         $body .= "\n\n" . "="x4 . "\n\n";
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org