summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranontwit <anontwit@ps7003.dreamhostps.com>2009-08-07 15:24:58 -0700
committerCraig Andrews <candrews@integralblue.com>2009-08-07 18:32:15 -0400
commit468252ee6a4604ef973a3a8497685ea88afc0531 (patch)
treed0be329eba257d392aaa60af67a18cf4857faef8
parenta7a87913befddd7b1ab8e0b4ab0e563e7927950b (diff)
bug 1770 conversation link for email
-rw-r--r--lib/mail.php40
1 files changed, 26 insertions, 14 deletions
diff --git a/lib/mail.php b/lib/mail.php
index 0050ad810..48e2cff65 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -596,32 +596,44 @@ function mail_notify_attn($user, $notice)
$bestname = $sender->getBestName();
common_init_locale($user->language);
-
+
+ if ($notice->conversation != $notice->id) {
+ $conversationEmailText = "The full conversation can be read here:\n\n".
+ "\t%5\$s\n\n ";
+ $conversationUrl = common_local_url('conversation',
+ array('id' => $notice->conversation)).'#notice-'.$notice->id;
+ } else {
+ $conversationEmailText = "%5\$s";
+ $conversationUrl = null;
+ }
+
$subject = sprintf(_('%s sent a notice to your attention'), $bestname);
-
- $body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
+
+ $body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
"The notice is here:\n\n".
"\t%3\$s\n\n" .
"It reads:\n\n".
"\t%4\$s\n\n" .
+ $conversationEmailText .
"You can reply back here:\n\n".
- "\t%5\$s\n\n" .
+ "\t%6\$s\n\n" .
"The list of all @-replies for you here:\n\n" .
- "%6\$s\n\n" .
+ "%7\$s\n\n" .
"Faithfully yours,\n" .
"%2\$s\n\n" .
- "P.S. You can turn off these email notifications here: %7\$s\n"),
- $bestname,
- common_config('site', 'name'),
+ "P.S. You can turn off these email notifications here: %8\$s\n"),
+ $bestname,//%1
+ common_config('site', 'name'),//%2
common_local_url('shownotice',
- array('notice' => $notice->id)),
- $notice->content,
+ array('notice' => $notice->id)),//%3
+ $notice->content,//%4
+ $conversationUrl,//%5
common_local_url('newnotice',
- array('replyto' => $sender->nickname)),
+ array('replyto' => $sender->nickname)),//%6
common_local_url('replies',
- array('nickname' => $user->nickname)),
- common_local_url('emailsettings'));
-
+ array('nickname' => $user->nickname)),//%7
+ common_local_url('emailsettings'));//%8
+
common_init_locale();
mail_to_user($user, $subject, $body);
}