clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed: 

- used $this->baseurl instead of DI::baseurl() (@MrPetovan)
This commit is contained in:
Roland Häder 2022-08-13 06:50:50 +02:00
parent cfa575b8e5
commit ff5673e2d8
No known key found for this signature in database
GPG Key ID: C82EDE5DDFA0BA77
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Module/Xrd.php
View File

@ -110,6 +110,7 @@ class Xrd extends BaseModule
private static function printSystemJSON(array $owner) private static function printSystemJSON(array $owner)
{ {
$baseURL = $this->baseurl->get();
$json = [ $json = [
'subject' => 'acct:' . $owner['addr'], 'subject' => 'acct:' . $owner['addr'],
'aliases' => [$owner['url']], 'aliases' => [$owner['url']],
@ -126,26 +127,26 @@ class Xrd extends BaseModule
], ],
[ [
'rel' => 'http://ostatus.org/schema/1.0/subscribe', 'rel' => 'http://ostatus.org/schema/1.0/subscribe',
'template' => DI::baseUrl()->get() . '/follow?url={uri}', 'template' => $baseURL . '/follow?url={uri}',
], ],
[ [
'rel' => ActivityNamespace::FEED, 'rel' => ActivityNamespace::FEED,
'type' => 'application/atom+xml', 'type' => 'application/atom+xml',
'href' => $owner['poll'] ?? DI::baseUrl()->get(), 'href' => $owner['poll'] ?? $baseURL,
], ],
[ [
'rel' => 'salmon', 'rel' => 'salmon',
'href' => DI::baseUrl()->get() . '/salmon/' . $owner['nickname'], 'href' => $baseURL . '/salmon/' . $owner['nickname'],
], ],
[ [
'rel' => 'http://microformats.org/profile/hcard', 'rel' => 'http://microformats.org/profile/hcard',
'type' => 'text/html', 'type' => 'text/html',
'href' => DI::baseUrl()->get() . '/hcard/' . $owner['nickname'], 'href' => $baseURL . '/hcard/' . $owner['nickname'],
], ],
[ [
'rel' => 'http://joindiaspora.com/seed_location', 'rel' => 'http://joindiaspora.com/seed_location',
'type' => 'text/html', 'type' => 'text/html',
'href' => DI::baseUrl()->get(), 'href' => $baseURL,
], ],
] ]
]; ];
@ -155,7 +156,7 @@ class Xrd extends BaseModule
private static function printJSON(string $alias, array $owner, array $avatar) private static function printJSON(string $alias, array $owner, array $avatar)
{ {
$baseURL = DI::baseUrl()->get(); $baseURL = $this->baseurl->get();
$salmon_key = Salmon::salmonKey($owner['spubkey']); $salmon_key = Salmon::salmonKey($owner['spubkey']);
$json = [ $json = [
@ -237,7 +238,7 @@ class Xrd extends BaseModule
private static function printXML(string $alias, array $user, array $owner, array $avatar) private static function printXML(string $alias, array $user, array $owner, array $avatar)
{ {
$baseURL = DI::baseUrl()->get(); $baseURL = $this->baseurl->get();
$salmon_key = Salmon::salmonKey($owner['spubkey']); $salmon_key = Salmon::salmonKey($owner['spubkey']);
$tpl = Renderer::getMarkupTemplate('xrd_person.tpl'); $tpl = Renderer::getMarkupTemplate('xrd_person.tpl');