Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-15 18:39:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14165 from annando/probe

Browse source 
Fixes "Undefined array key url"
This commit is contained in:
Hypolite Petovan 2024-05-16 11:15:59 -04:00 • committed by GitHub
commit 1f12d1e668
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/Probe.php
View file

@ -1201,7 +1201,7 @@ class Probe
if (!empty($webfinger['aliases']) && is_array($webfinger['aliases'])) { if (!empty($webfinger['aliases']) && is_array($webfinger['aliases'])) {
foreach ($webfinger['aliases'] as $alias) { foreach ($webfinger['aliases'] as $alias) {
if (empty($data['url']) && !strstr($alias, '@')) { if (empty($data['url']) && Network::isValidHttpUrl($alias)) {
$data['url'] = $alias; $data['url'] = $alias;
} elseif (Network::isValidHttpUrl($alias) && !Strings::compareLink($alias, $data['url'])) { } elseif (Network::isValidHttpUrl($alias) && !Strings::compareLink($alias, $data['url'])) {
$data['alias'] = $alias; $data['alias'] = $alias;
@ -1455,7 +1455,7 @@ class Probe
if (!empty($webfinger['aliases']) && is_array($webfinger['aliases'])) { if (!empty($webfinger['aliases']) && is_array($webfinger['aliases'])) {
foreach ($webfinger['aliases'] as $alias) { foreach ($webfinger['aliases'] as $alias) {
if (strstr($alias, '@') && !strstr(Strings::normaliseLink($alias), 'http://')) { if (strstr($alias, '@') && !Network::isValidHttpUrl($alias)) {
$data['addr'] = str_replace('acct:', '', $alias); $data['addr'] = str_replace('acct:', '', $alias);
} }
} }
@ -1463,7 +1463,7 @@ class Probe
if ( if (
!empty($webfinger['subject']) && strstr($webfinger['subject'], '@') !empty($webfinger['subject']) && strstr($webfinger['subject'], '@')
&& !strstr(Strings::normaliseLink($webfinger['subject']), 'http://') && !Network::isValidHttpUrl($webfinger['subject'])
) { ) {
$data['addr'] = str_replace('acct:', '', $webfinger['subject']); $data['addr'] = str_replace('acct:', '', $webfinger['subject']);
} }