harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates to hcard parsing

Browse Source
This commit is contained in:
redmatrix 2016-08-07 21:00:23 -07:00
parent 3338f3c5b2
commit 07dca90352
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/network.php
View File

@ -1343,13 +1343,18 @@ function discover_by_webbie($webbie) {
$fullname = $vcard['fn']; $fullname = $vcard['fn'];
if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0)) if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0))
$vcard['photo'] = $diaspora_base . '/' . $vcard['photo']; $vcard['photo'] = $diaspora_base . '/' . $vcard['photo'];
if(($vcard['key']) && (! $pubkey)) if(($vcard['public_key']) && (! $pubkey)) {
$pubkey = $vcard['key']; $diaspora_key = $vcard['public_key'];
if(strstr($diaspora_key,'RSA '))
$pubkey = rsatopem($diaspora_key);
else
$pubkey = $diaspora_key;
}
if(! $avatar) if(! $avatar)
$avatar = $vcard['photo']; $avatar = $vcard['photo'];
if($diaspora) { if($diaspora) {
if(($vcard['guid']) && (! $diaspora_guid)) if(($vcard['uid']) && (! $diaspora_guid))
$diaspora_guid = $vcard['guid']; $diaspora_guid = $vcard['uid'];
if(($vcard['url']) && (! $diaspora_base)) if(($vcard['url']) && (! $diaspora_base))
$diaspora_base = $vcard['url']; $diaspora_base = $vcard['url'];