From 2ad4de45e6b0f7edc629fb08346d978039f1c8a3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:12:35 -0500 Subject: [PATCH] block subscribes by silenced users --- lib/oauthstore.php | 4 ++++ lib/subs.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/oauthstore.php b/lib/oauthstore.php index a4ea5ad4d0..b04bcbb8b2 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 2f0f970495..2fc3160dec 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!'); } -- 2.39.5