keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove address from name

Browse source
This commit is contained in:
Michael 2018-02-13 07:10:05 +00:00
parent 7df60ae634
commit 6a486aa92b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Network/Probe.php
View file

@ -652,7 +652,7 @@ class Probe
$result = self::ostatus($webfinger); $result = self::ostatus($webfinger);
} }
if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) { if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
$result = self::pumpio($webfinger); $result = self::pumpio($webfinger, $addr);
} }
if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) { if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
$result = self::feed($uri); $result = self::feed($uri);
@ -676,7 +676,6 @@ class Probe
$result["baseurl"] = substr($result["url"], 0, $pos).$host; $result["baseurl"] = substr($result["url"], 0, $pos).$host;
} }
} }
return $result; return $result;
} }
@ -1377,7 +1376,7 @@ class Probe
* *
* @return array pump.io data * @return array pump.io data
*/ */
private static function pumpio($webfinger) private static function pumpio($webfinger, $addr)
{ {
$data = []; $data = [];
foreach ($webfinger["links"] as $link) { foreach ($webfinger["links"] as $link) {
@ -1415,6 +1414,13 @@ class Probe
$data = array_merge($data, $profile_data); $data = array_merge($data, $profile_data);
if (($addr != '') && ($data['name'] != '')) {
$name = trim(str_replace($addr, '', $data['name']));
if ($name != '') {
$data['name'] = $name;
}
}
return $data; return $data;
} }