diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 19:39:21 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 19:39:21 -0700 |
| commit | eb6a1f838724504f0034d51a28567ea9a8119b54 (patch) | |
| tree | 6771f131d715e93a5ef3329b3fcb1a63b8c4e6e1 /include/follow.php | |
| parent | 03357481f73d506ae36be9858dc757842408c6a9 (diff) | |
| parent | 9592f7f3e6884e2b8b77c713634393fdf4e2ff7c (diff) | |
| download | volse-hubzilla-eb6a1f838724504f0034d51a28567ea9a8119b54.tar.gz volse-hubzilla-eb6a1f838724504f0034d51a28567ea9a8119b54.tar.bz2 volse-hubzilla-eb6a1f838724504f0034d51a28567ea9a8119b54.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include/follow.php')
| -rw-r--r-- | include/follow.php | 9 |
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; |