X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsubs.php;h=4b6b03967aee356bccbcd0675dfe3defe1ec0adb;hb=d41a0a5ed03b2f4bbf8e8b3984960103383090d1;hp=934380b76e88dc569e6bce478709e60ddfd85f1d;hpb=76b0e6e6f4151235d5032d1aa90f0937b415bd87;p=quix0rs-gnu-social.git

diff --git a/lib/subs.php b/lib/subs.php
index 934380b76e..4b6b03967a 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!');
     }
@@ -121,7 +125,13 @@ function subs_unsubscribe_user($user, $other_nickname)
 function subs_unsubscribe_to($user, $other)
 {
     if (!$user->isSubscribed($other))
-        return _('Not subscribed!.');
+        return _('Not subscribed!');
+
+    // Don't allow deleting self subs
+
+    if ($user->id == $other->id) {
+        return _('Couldn\'t delete self-subscription.');
+    }
 
     $sub = DB_DataObject::factory('subscription');