diff options
| author | marijus <mario@mariovavti.com> | 2014-08-26 09:14:03 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-26 09:14:03 +0200 |
| commit | 592be716265b79ab68209838bf879c5d26b60439 (patch) | |
| tree | 0d2db6e47e9f8183136bc3679898f192c1141064 /include/zot.php | |
| parent | 9e8a2a06b538dd6d8919af9fb7ddfe55fc9e2a33 (diff) | |
| parent | c99d89e441c742ceaaa299c9de9c2fb322b41993 (diff) | |
| download | volse-hubzilla-592be716265b79ab68209838bf879c5d26b60439.tar.gz volse-hubzilla-592be716265b79ab68209838bf879c5d26b60439.tar.bz2 volse-hubzilla-592be716265b79ab68209838bf879c5d26b60439.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php index a155b2588..65c092b93 100644 --- a/include/zot.php +++ b/include/zot.php @@ -198,11 +198,17 @@ function zot_finger($webbie,$channel,$autofallback = true) { if($r) { $url = $r[0]['hubloc_url']; + + if($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') { + logger('zot_finger: alternate network: ' . $webbie); + return array('success' => false); + } } else { $url = 'https://' . $host; } - + + $rhs = '/.well-known/zot-info'; $https = ((strpos($url,'https://') === 0) ? true : false); @@ -271,6 +277,11 @@ function zot_finger($webbie,$channel,$autofallback = true) { function zot_refresh($them,$channel = null, $force = false) { + if(array_key_exists('xchan_network',$them) && ($them['xchan_network'] !== 'zot')) { + logger('zot_refresh: not got zot. ' . $them['xchan_name']); + return true; + } + logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA); if($channel) logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA); |