aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-06-14 13:35:17 +0000
committerMario <mario@mariovavti.com>2020-06-14 13:35:17 +0000
commit92ee27349cb62e0a78f25686c3fe64cd8dd4130c (patch)
tree2e8835dd153b8cfbd41470a327486a82a3c83163
parenta88233a045679f3d7ea4c14eb68e62816fb10ba7 (diff)
downloadvolse-hubzilla-92ee27349cb62e0a78f25686c3fe64cd8dd4130c.tar.gz
volse-hubzilla-92ee27349cb62e0a78f25686c3fe64cd8dd4130c.tar.bz2
volse-hubzilla-92ee27349cb62e0a78f25686c3fe64cd8dd4130c.zip
check for zot6 first
-rw-r--r--include/network.php48
1 files changed, 25 insertions, 23 deletions
diff --git a/include/network.php b/include/network.php
index 80d19797b..aada36fba 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1102,29 +1102,6 @@ function discover_by_webbie($webbie, $protocol = '') {
$x = webfinger_rfc7033($webbie, true);
if($x && array_key_exists('links',$x) && $x['links']) {
- foreach($x['links'] as $link) {
- if(array_key_exists('rel',$link)) {
-
- // If we discover zot - don't search further; grab the info and get out of
- // here.
-
- if($link['rel'] === PROTOCOL_ZOT && ((! $protocol) || (strtolower($protocol) === 'zot'))) {
- logger('zot found for ' . $webbie, LOGGER_DEBUG);
- if(array_key_exists('zot',$x) && $x['zot']['success']) {
- $i = import_xchan($x['zot']);
- return true;
- }
- else {
- $z = z_fetch_url($link['href']);
- if($z['success']) {
- $j = json_decode($z['body'],true);
- $i = import_xchan($j);
- return true;
- }
- }
- }
- }
- }
foreach($x['links'] as $link) {
if(array_key_exists('rel',$link)) {
@@ -1150,6 +1127,31 @@ function discover_by_webbie($webbie, $protocol = '') {
}
}
}
+
+ foreach($x['links'] as $link) {
+ if(array_key_exists('rel',$link)) {
+
+ // If we discover zot - don't search further; grab the info and get out of
+ // here.
+
+ if($link['rel'] === PROTOCOL_ZOT && ((! $protocol) || (strtolower($protocol) === 'zot'))) {
+ logger('zot found for ' . $webbie, LOGGER_DEBUG);
+ if(array_key_exists('zot',$x) && $x['zot']['success']) {
+ $i = import_xchan($x['zot']);
+ return true;
+ }
+ else {
+ $z = z_fetch_url($link['href']);
+ if($z['success']) {
+ $j = json_decode($z['body'],true);
+ $i = import_xchan($j);
+ return true;
+ }
+ }
+ }
+ }
+ }
+
}
logger('webfinger: ' . print_r($x,true), LOGGER_DATA, LOG_INFO);