Merge develop into 201820_-_fix_mod_redir

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index bbfd7ce64a31687f5fc0a66e787c6c3c3e645e54..d251d41fe3764e9937d41dd723d671aaf789f141 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -66,20 +66,23 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
        header("Content-type: application/json; charset=utf-8");
 
        $json = ['subject' => $uri,
-                       'aliases' => [$alias, $profile_url],
-                       'links' => [['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
-                                       ['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
-                                       ['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
-                                       ['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
-                                       ['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
-                                       ['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
-                                       ['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
-                                       ['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
-                                       ['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
-                                       ['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]
-       ]];
+               'aliases' => [$alias, $profile_url],
+               'links' => [
+                       ['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
+                       ['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
+                       ['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
+                       ['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
+                       ['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
+                       ['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
+                       ['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
+                       ['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
+                       ['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
+                       ['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']
+               ]
+       ];
        echo json_encode($json);
        killme();
 }
@@ -102,10 +105,11 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r)
                '$atom'        => System::baseUrl() . '/dfrn_poll/'     . $r['nickname'],
                '$poco_url'    => System::baseUrl() . '/poco/'          . $r['nickname'],
                '$photo'       => System::baseUrl() . '/photo/profile/' . $r['uid']      . '.jpg',
-               '$baseurl' => System::baseUrl(),
+               '$baseurl'     => System::baseUrl(),
                '$salmon'      => System::baseUrl() . '/salmon/'        . $r['nickname'],
                '$salmen'      => System::baseUrl() . '/salmon/'        . $r['nickname'] . '/mention',
                '$subscribe'   => System::baseUrl() . '/follow?url={uri}',
+               '$openwebauth' => System::baseUrl() . '/owa',
                '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key]
        );