From e9321a18063911f28bb55e355298ce65b36b5b71 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 16 Nov 2009 19:46:08 +0100
Subject: [PATCH] more rights denied to silenced and sandboxed

---
 classes/Profile.php | 4 ++++
 lib/right.php       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/classes/Profile.php b/classes/Profile.php
index 291e3f0645..8754c506ce 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -690,9 +690,13 @@ class Profile extends Memcached_DataObject
                 $result = $this->hasRole(Profile_role::ADMINISTRATOR);
                 break;
             case Right::NEWNOTICE:
+            case Right::NEWMESSAGE:
+            case Right::SUBSCRIBE:
                 $result = !$this->isSilenced();
                 break;
             case Right::PUBLICNOTICE:
+            case Right::EMAILONREPLY:
+            case Right::EMAILONSUBSCRIBE:
                 $result = !$this->isSandboxed();
                 break;
             default:
diff --git a/lib/right.php b/lib/right.php
index 1a3a7d49a7..90ca75fd5b 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -52,5 +52,9 @@ class Right
     const SANDBOXUSER        = 'sandboxuser';
     const NEWNOTICE          = 'newnotice';
     const PUBLICNOTICE       = 'publicnotice';
+    const NEWMESSAGE         = 'newmessage';
+    const SUBSCRIBE          = 'subscribe';
+    const EMAILONREPLY       = 'emailonreply';
+    const EMAILONSUBSCRIBE   = 'emailonsubscribe';
 }