GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

silently skip email for subs from sandboxed user

Browse Source
This commit is contained in:
Evan Prodromou 2009-11-16 14:11:14 -05:00
parent 440af7ed7a
commit e150d920a5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mail.php
View File

@ -216,7 +216,8 @@ function mail_subscribe_notify($listenee, $listener)
function mail_subscribe_notify_profile($listenee, $other) function mail_subscribe_notify_profile($listenee, $other)
{ {
if ($listenee->email && $listenee->emailnotifysub) { if ($other->hasRight(Right::EMAILONSUBSCRIBE) &&
$listenee->email && $listenee->emailnotifysub) {
// use the recipient's localization // use the recipient's localization
common_init_locale($listenee->language); common_init_locale($listenee->language);
@ -597,7 +598,7 @@ function mail_notify_attn($user, $notice)
$bestname = $sender->getBestName(); $bestname = $sender->getBestName();
common_init_locale($user->language); common_init_locale($user->language);
if ($notice->conversation != $notice->id) { if ($notice->conversation != $notice->id) {
$conversationEmailText = "The full conversation can be read here:\n\n". $conversationEmailText = "The full conversation can be read here:\n\n".
"\t%5\$s\n\n "; "\t%5\$s\n\n ";
@ -607,9 +608,9 @@ function mail_notify_attn($user, $notice)
$conversationEmailText = "%5\$s"; $conversationEmailText = "%5\$s";
$conversationUrl = null; $conversationUrl = null;
} }
$subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname); $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname);
$body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n". $body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
"The notice is here:\n\n". "The notice is here:\n\n".
"\t%3\$s\n\n" . "\t%3\$s\n\n" .
@ -635,7 +636,7 @@ function mail_notify_attn($user, $notice)
array('nickname' => $user->nickname)),//%7 array('nickname' => $user->nickname)),//%7
common_local_url('emailsettings'), //%8 common_local_url('emailsettings'), //%8
$sender->nickname); //%9 $sender->nickname); //%9
common_init_locale(); common_init_locale();
mail_to_user($user, $subject, $body); mail_to_user($user, $subject, $body);
} }