bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2212 from annando/1512-xrd

Browse source 
XRD now should react more like an OStatus server
This commit is contained in:
Tobias Diekershoff 2015-12-28 05:24:36 +01:00
parent 3dd08094ca 8b25f51116
commit b09fd2c39e
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mod/xrd.php
View file

@ -6,9 +6,11 @@ function xrd_init(&$a) {
$uri = urldecode(notags(trim($_GET['uri']))); $uri = urldecode(notags(trim($_GET['uri'])));
if(substr($uri,0,4) === 'http') if(substr($uri,0,4) === 'http') {
$acct = false;
$name = basename($uri); $name = basename($uri);
else { } else {
$acct = true;
$local = str_replace('acct:', '', $uri); $local = str_replace('acct:', '', $uri);
if(substr($local,0,2) == '//') if(substr($local,0,2) == '//')
$local = substr($local,2); $local = substr($local,2);
@ -28,7 +30,6 @@ function xrd_init(&$a) {
header("Content-type: text/xml"); header("Content-type: text/xml");
if(get_config('system','diaspora_enabled')) { if(get_config('system','diaspora_enabled')) {
//$tpl = file_get_contents('view/xrd_diaspora.tpl');
$tpl = get_markup_template('xrd_diaspora.tpl'); $tpl = get_markup_template('xrd_diaspora.tpl');
$dspr = replace_macros($tpl,array( $dspr = replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
@ -39,13 +40,24 @@ function xrd_init(&$a) {
else else
$dspr = ''; $dspr = '';
//$tpl = file_get_contents('view/xrd_person.tpl');
$tpl = get_markup_template('xrd_person.tpl'); $tpl = get_markup_template('xrd_person.tpl');
$profile_url = $a->get_baseurl().'/profile/'.$r[0]['nickname'];
if ($acct)
$alias = $profile_url;
else {
$alias = 'acct:'.$r[0]['nickname'].'@'.$a->get_hostname();
if ($a->get_path())
$alias .= '/'.$a->get_path();
}
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$nick' => $r[0]['nickname'], '$nick' => $r[0]['nickname'],
'$accturi' => $uri, '$accturi' => $uri,
'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'], '$alias' => $alias,
'$profile_url' => $profile_url,
'$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'], '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'],
'$atom' => $a->get_baseurl() . '/dfrn_poll/' . $r[0]['nickname'], '$atom' => $a->get_baseurl() . '/dfrn_poll/' . $r[0]['nickname'],
'$zot_post' => $a->get_baseurl() . '/post/' . $r[0]['nickname'], '$zot_post' => $a->get_baseurl() . '/post/' . $r[0]['nickname'],

7
view/templates/xrd_person.tpl
View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>{{$accturi}}</Subject>
<Subject>{{$accturi}}</Subject> <Alias>{{$profile_url}}</Alias>
<Alias>{{$accturi}}</Alias> <Alias>{{$alias}}</Alias>
<Alias>{{$profile_url}}</Alias>
<Link rel="http://purl.org/macgirvin/dfrn/1.0" <Link rel="http://purl.org/macgirvin/dfrn/1.0"
href="{{$profile_url}}" /> href="{{$profile_url}}" />