diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-23 11:52:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-23 11:52:32 +0200 |
| commit | 5bd1ea0b959494bb981335c992783b69f9a9de6d (patch) | |
| tree | c5130ae2b01ca204cdc44370476fbfc2c49ca1d9 /Zotlabs/Module/Webfinger.php | |
| parent | 689ced2ac007f086ba72151c94f4d4975e3ed9de (diff) | |
| parent | 9ac67b44e42f433e34f60556e631b7573a83eb50 (diff) | |
| download | volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.tar.gz volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.tar.bz2 volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.zip | |
Merge branch 'dev' into 3.4RC
Diffstat (limited to 'Zotlabs/Module/Webfinger.php')
| -rw-r--r-- | Zotlabs/Module/Webfinger.php | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/Zotlabs/Module/Webfinger.php b/Zotlabs/Module/Webfinger.php index c50680de7..0dafae23c 100644 --- a/Zotlabs/Module/Webfinger.php +++ b/Zotlabs/Module/Webfinger.php @@ -17,33 +17,15 @@ class Webfinger extends \Zotlabs\Web\Controller { $o .= '<br /><br />'; - $old = false; if(x($_GET,'addr')) { $addr = trim($_GET['addr']); - // if(strpos($addr,'@') !== false) { - $res = webfinger_rfc7033($addr,true); - if(! $res) { - $res = old_webfinger($addr); - $old = true; - } - // } - // else { - // if(function_exists('lrdd')) - // $res = lrdd($addr); - // } - - if($res && $old) { - foreach($res as $r) { - if($r['@attributes']['rel'] === 'http://microformats.org/profile/hcard') { - $hcard = unamp($r['@attributes']['href']); - require_once('library/HTML5/Parser.php'); - $res['vcard'] = scrape_vcard($hcard); - break; - } - } + + $res = webfinger_rfc7033($addr,true); + if(! $res) { + $res = old_webfinger($addr); } - + $o .= '<pre>'; $o .= str_replace("\n",'<br />',print_r($res,true)); $o .= '</pre>'; |