From 99ebb565297d442f4721fe575f1bed2826cadbd5 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 8 Nov 2009 22:39:02 +0100
Subject: !. => !

---
 lib/subs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/subs.php')

diff --git a/lib/subs.php b/lib/subs.php
index 68c89c842..934380b76 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -45,7 +45,7 @@ function subs_subscribe_user($user, $other_nickname)
 function subs_subscribe_to($user, $other)
 {
     if ($user->isSubscribed($other)) {
-        return _('Already subscribed!.');
+        return _('Already subscribed!');
     }
 
     if ($other->hasBlocked($user)) {
-- 
cgit v1.2.3-54-g00ecf


From 21603f02258346aa516db77c1691ee32f180fcbc Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 13 Nov 2009 11:28:54 +0100
Subject: Fix typo (!. -> !)

---
 lib/subs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/subs.php')

diff --git a/lib/subs.php b/lib/subs.php
index 934380b76..2f0f97049 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -121,7 +121,7 @@ function subs_unsubscribe_user($user, $other_nickname)
 function subs_unsubscribe_to($user, $other)
 {
     if (!$user->isSubscribed($other))
-        return _('Not subscribed!.');
+        return _('Not subscribed!');
 
     $sub = DB_DataObject::factory('subscription');
 
-- 
cgit v1.2.3-54-g00ecf


From 2ad4de45e6b0f7edc629fb08346d978039f1c8a3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 16 Nov 2009 14:12:35 -0500
Subject: block subscribes by silenced users

---
 lib/oauthstore.php | 4 ++++
 lib/subs.php       | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'lib/subs.php')

diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index a4ea5ad4d..b04bcbb8b 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -462,6 +462,10 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $subscribed = $this->_getAnyProfile($subscribed_user_uri);
         $subscriber = $this->_getAnyProfile($subscriber_uri);
 
+        if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
+            return _('You have been banned from subscribing.');
+        }
+
         $sub->subscribed = $subscribed->id;
         $sub->subscriber = $subscriber->id;
 
diff --git a/lib/subs.php b/lib/subs.php
index 2f0f97049..2fc3160de 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -44,6 +44,10 @@ function subs_subscribe_user($user, $other_nickname)
 
 function subs_subscribe_to($user, $other)
 {
+    if (!$user->hasRight(Right::SUBSCRIBE)) {
+        return _('You have been banned from subscribing.');
+    }
+
     if ($user->isSubscribed($other)) {
         return _('Already subscribed!');
     }
-- 
cgit v1.2.3-54-g00ecf