From e150d920a53cbafaf6ff3f6397fa40f8cc0e526e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 16 Nov 2009 14:11:14 -0500
Subject: [PATCH] silently skip email for subs from sandboxed user

---
 lib/mail.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/mail.php b/lib/mail.php
index 5218059e9d..94d5dcb121 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -216,7 +216,8 @@ function mail_subscribe_notify($listenee, $listener)
 
 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
         common_init_locale($listenee->language);
@@ -597,7 +598,7 @@ 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 ";
@@ -607,9 +608,9 @@ function mail_notify_attn($user, $notice)
 		$conversationEmailText = "%5\$s";
 		$conversationUrl = null;
 	}
-	
+
     $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".
                       "The notice is here:\n\n".
                       "\t%3\$s\n\n" .
@@ -635,7 +636,7 @@ function mail_notify_attn($user, $notice)
                                      array('nickname' => $user->nickname)),//%7
                     common_local_url('emailsettings'), //%8
                     $sender->nickname); //%9
-	
+
     common_init_locale();
     mail_to_user($user, $subject, $body);
 }