friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Issue 6149: Making OWA (hopefully) compatible with Hubzilla

This commit is contained in:
Michael 2019-01-08 11:17:05 +00:00
parent 7e19506435
commit 8c6df8f156
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/xrd.php
View File

@ -92,7 +92,7 @@ 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']
]
];

2
src/Module/Magic.php
View File

@ -74,7 +74,7 @@ class Magic extends BaseModule
$basepath = $exp[0];
$headers = [];
$headers['Accept'] = 'application/x-dfrn+json';
$headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
$headers['X-Open-Web-Auth'] = Strings::getRandomHex();
// Create a header that is signed with the local users private key.

2
src/Module/Owa.php
View File

@ -86,6 +86,6 @@ class Owa extends BaseModule
}
}
}
System::jsonExit($ret, 'application/x-dfrn+json');
System::jsonExit($ret, 'application/x-zot+json');
}
}

2
view/templates/xrd_person.tpl
View File

@ -34,6 +34,6 @@
<Link rel="magic-public-key"
href="{{$modexp}}" />
<Link rel="http://purl.org/openwebauth/v1"
type="application/x-dfrn+json"
type="application/x-zot+json"
href="{{$openwebauth}}" />
</XRD>