disallow email on faves from sandboxed users

3 files changed, 6 insertions, 0 deletions

diff --git a/classes/Profile.php b/classes/Profile.php
index 8754c506c..d52dff5af 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -697,6 +697,7 @@ class Profile extends Memcached_DataObject
             case Right::PUBLICNOTICE:
             case Right::EMAILONREPLY:
             case Right::EMAILONSUBSCRIBE:
+            case Right::EMAILONFAVE:
                 $result = !$this->isSandboxed();
                 break;
             default:
diff --git a/lib/mail.php b/lib/mail.php
index 6e74d1806..dffac3262 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -546,6 +546,10 @@ function mail_notify_message($message, $from=null, $to=null)
 
 function mail_notify_fave($other, $user, $notice)
 {
+    if (!$user->hasRight(Right::EMAILONFAVE)) {
+        return;
+    }
+
     $profile = $user->getProfile();
 
     $bestname = $profile->getBestName();
diff --git a/lib/right.php b/lib/right.php
index 90ca75fd5..5e66eae0e 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -56,5 +56,6 @@ class Right
     const SUBSCRIBE          = 'subscribe';
     const EMAILONREPLY       = 'emailonreply';
     const EMAILONSUBSCRIBE   = 'emailonsubscribe';
+    const EMAILONFAVE        = 'emailonfave';
 }