toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.

1 files changed, 9 insertions, 0 deletions

diff --git a/include/follow.php b/include/follow.php
index fd4e1597a..1e5df4cd5 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -135,6 +135,15 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 				$result['message'] = t('Protocol disabled.');
 				return $result;
 			}
+
+			$allowed = get_pconfig($uid,'system','diaspora_allowed');
+			if($allowed === false)
+				$allowed = 1;
+
+			if(! intval($allowed)) {
+				$result['message'] = t('Protocol blocked for this channel.');
+				return $result;
+			}
 		}
 
 		$their_perms = 0;