more rights denied to silenced and sandboxed

diff --git a/classes/Profile.php b/classes/Profile.php
index 291e3f0645fcdd095f1723f5cd1deb66b51b36d8..8754c506ced67993b83ea0a4c68b22797fb0ac98 100644 (file)
--- 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 1a3a7d49a79515cf15ed60de56d1e5c6d0df52c3..90ca75fd5be28f5ba01e0ea11c8a9ef1b67842dd 100644 (file)
--- 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';
 }