diff options
| author | Max Kostikov <max@kostikov.co> | 2021-03-10 19:41:46 +0000 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-03-10 19:41:46 +0000 |
| commit | b729cee9e4aaf908d28835341171311532ae05d6 (patch) | |
| tree | f47ec7020c314c9101d4ddceb222b608166d4825 /include/network.php | |
| parent | 15b45af550cb59013cbf915c63635fdf03cdd73e (diff) | |
| parent | 15bc5c64f3f4c3226e6329f8b8aa73df4aeb5e0b (diff) | |
| download | volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.tar.gz volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.tar.bz2 volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php index f5ff48fce..fcc7b4289 100644 --- a/include/network.php +++ b/include/network.php @@ -1134,11 +1134,15 @@ function discover_by_webbie($webbie, $protocol = '') { foreach($x['links'] as $link) { if(array_key_exists('rel',$link)) { if($link['rel'] === PROTOCOL_ZOT6 && ((! $protocol) || (strtolower($protocol) === 'zot6'))) { + logger('zot6 found for ' . $webbie, LOGGER_DEBUG); $record = Zotfinger::exec($link['href']); + if (! $record) { + logger('Record not found for ' . $link['href']); + continue; + } // Check the HTTP signature - $hsig = $record['signature']; if($hsig && $hsig['signer'] === $link['href'] && $hsig['header_valid'] === true && $hsig['content_valid'] === true) $hsig_valid = true; @@ -1226,7 +1230,7 @@ function webfinger_rfc7033($webbie, $zot = false) { if($m['scheme'] !== 'https') return false; - $rhs = $m['host'] . (($m['port']) ? ':' . $m['port'] : ''); + $rhs = $m['host'] . (array_key_exists('port', $m) ? ':' . $m['port'] : ''); $resource = urlencode($webbie); } } @@ -1957,10 +1961,10 @@ function service_plink($contact, $guid) { $m = parse_url($contact['xchan_url']); if($m) { - $url = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : ''); + $url = $m['scheme'] . '://' . $m['host'] . (array_key_exists('port', $m) ? ':' . $m['port'] : ''); } else { - $url = 'https://' . substr($contact['xchan_addr'],strpos($contact['xchan_addr'],'@')+1); + $url = 'https://' . substr($contact['xchan_addr'], strpos($contact['xchan_addr'], '@') + 1); } $handle = substr($contact['xchan_addr'], 0, strpos($contact['xchan_addr'],'@')); |