X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=b4cb60afed68c7b1c80b27a61cc0e84ab8b90a07;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=4b9b0ee8fb4e1931848b799cb07d5a86ec6b2dc7;hpb=218f0734be88e3a504680dd06b917f78787ec8bc;p=friendica.git diff --git a/mod/xrd.php b/mod/xrd.php index 4b9b0ee8fb..b4cb60afed 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -4,7 +4,7 @@ */ use Friendica\App; -use Friendica\Core\Addon; +use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; @@ -63,13 +63,13 @@ function xrd_init(App $a) } if ($mode == 'xml') { - xrd_xml($a, $addr, $alias, $profile_url, $user); + xrd_xml($addr, $alias, $profile_url, $user); } else { - xrd_json($a, $addr, $alias, $profile_url, $user); + xrd_json($addr, $alias, $profile_url, $user); } } -function xrd_json($a, $uri, $alias, $profile_url, $r) +function xrd_json($uri, $alias, $profile_url, $r) { $salmon_key = Salmon::salmonKey($r['spubkey']); @@ -92,15 +92,15 @@ function xrd_json($a, $uri, $alias, $profile_url, $r) ['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'], ['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'], ['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key], - ['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa'] + ['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-zot+json', 'href' => System::baseUrl().'/owa'] ] ]; echo json_encode($json); - killme(); + exit(); } -function xrd_xml($a, $uri, $alias, $profile_url, $r) +function xrd_xml($uri, $alias, $profile_url, $r) { $salmon_key = Salmon::salmonKey($r['spubkey']); @@ -127,8 +127,8 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r) ); $arr = ['user' => $r, 'xml' => $o]; - Addon::callHooks('personal_xrd', $arr); + Hook::callAll('personal_xrd', $arr); echo $arr['xml']; - killme(); + exit(); }