[ljcom] r10768: LJSV-1687: Now link to inbox contain 'se...

LJSV-1687: Now link to inbox contain 'selected' value. Paid and permanent users have 'Reply to messsage' link no in email notification.

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/Hooks/SUP.pm

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-07-19 07:18:23 UTC (rev 10767)
+++ trunk/bin/upgrading/en_LJ.dat	2011-07-19 08:17:53 UTC (rev 10768)
@@ -2000,6 +2000,9 @@
 Or you can:
 .
 
+esn.reply_message|staleness=1
+esn.reply_message=[[openlink]]Reply to message[[closelink]]
+
 esn.error.quota=You have exceeded your quota of [[quota]] active subscriptions. Please <a[[aopts]]>delete or de-activate some of your existing subscriptions</a> in order to add new ones.
 
 esn.error.quota.upgrade|staleness=1

Modified: trunk/cgi-bin/LJ/Hooks/SUP.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/SUP.pm	2011-07-19 07:18:23 UTC (rev 10767)
+++ trunk/cgi-bin/LJ/Hooks/SUP.pm	2011-07-19 08:17:53 UTC (rev 10768)
@@ -706,7 +706,8 @@
     my $msg         = $ev->load_message;
     my $other_u     = $msg->other_u;
     my $sender      = $other_u->user;
-    my $inbox       = "$LJ::SITEROOT/inbox/?view=usermsg_recvd";
+    my $msgid       = $msg->msgid;
+    my $inbox       = "$LJ::SITEROOT/inbox/?view=usermsg_recvd&selected=" . $msgid;
     $inbox = "<a href=\"$inbox\">" . LJ::Lang::get_text($lang, 'esn.your_inbox') . "</a>" if $is_html;
 
     my $vars = {
@@ -720,12 +721,14 @@
         siteroot        => $LJ::SITEROOT,
     };
 
+    my $reply_lnk = "$LJ::SITEROOT/inbox/compose.bml?mode=reply&msgid=$msgid";
     my $body = LJ::Lang::get_text($lang, 'esn.email.pm', undef, $vars) .
         $ev->format_options($is_html, $lang, $vars,
         {
-            'esn.view_profile'    => [ 1, $other_u->profile_url ],
-            'esn.read_journal'    => [ 2, $other_u->journal_base ],
-            'esn.add_friend'      => [ $u->is_friend($other_u) ? 0 : 3,
+            'esn.reply_message'   => [ 1, $reply_lnk ],
+            'esn.view_profile'    => [ 2, $other_u->profile_url ],
+            'esn.read_journal'    => [ 3, $other_u->journal_base ],
+            'esn.add_friend'      => [ $u->is_friend($other_u) ? 0 : 4,
                                             "$LJ::SITEROOT/friends/add.bml?user=$sender" ],
         }
     );