<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
} else {
$owner = User::getOwnerDataByNick($name);
if (empty($owner)) {
- DI::logger()->warning('No owner data for user id', ['uri' => $uri, 'name' => $name]);
+ DI::logger()->notice('No owner data for user id', ['uri' => $uri, 'name' => $name]);
throw new NotFoundException('Owner was not found for user->uid=' . $name);
}
private function printSystemJSON(array $owner)
{
- $baseURL = $this->baseUrl->get();
+ $baseURL = $this->baseUrl;
$json = [
'subject' => 'acct:' . $owner['addr'],
'aliases' => [$owner['url']],
],
[
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
- 'template' => $baseURL . '/follow?url={uri}',
+ 'template' => $baseURL . '/contact/follow?url={uri}',
],
[
'rel' => ActivityNamespace::FEED,
private function printJSON(string $alias, array $owner, array $avatar)
{
- $baseURL = $this->baseUrl->get();
+ $baseURL = $this->baseUrl;
$json = [
'subject' => 'acct:' . $owner['addr'],
'type' => 'text/html',
'href' => $baseURL . '/hcard/' . $owner['nickname'],
],
- [
- 'rel' => ActivityNamespace::POCO,
- 'href' => $owner['poco'],
- ],
[
'rel' => 'http://webfinger.net/rel/avatar',
'type' => $avatar['type'],
],
[
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
- 'template' => $baseURL . '/follow?url={uri}',
+ 'template' => $baseURL . '/contact/follow?url={uri}',
],
[
'rel' => 'magic-public-key',
private function printXML(string $alias, array $owner, array $avatar)
{
- $baseURL = $this->baseUrl->get();
-
- $xml = null;
+ $baseURL = $this->baseUrl;
- XML::fromArray([
+ $xmlString = XML::fromArray([
'XRD' => [
'@attributes' => [
'xmlns' => 'http://docs.oasis-open.org/ns/xri/xrd-1.0',
]
],
'5:link' => [
- '@attributes' => [
- 'rel' => 'http://portablecontacts.net/spec/1.0',
- 'href' => $owner['poco']
- ]
- ],
- '6:link' => [
'@attributes' => [
'rel' => 'http://webfinger.net/rel/avatar',
'type' => $avatar['type'],
'href' => User::getAvatarUrl($owner)
]
],
- '7:link' => [
+ '6:link' => [
'@attributes' => [
'rel' => 'http://joindiaspora.com/seed_location',
'type' => 'text/html',
'href' => $baseURL
]
],
- '8:link' => [
+ '7:link' => [
'@attributes' => [
'rel' => 'salmon',
'href' => $baseURL . '/salmon/' . $owner['nickname']
]
],
- '9:link' => [
+ '8:link' => [
'@attributes' => [
'rel' => 'http://salmon-protocol.org/ns/salmon-replies',
'href' => $baseURL . '/salmon/' . $owner['nickname']
]
],
- '10:link' => [
+ '9:link' => [
'@attributes' => [
'rel' => 'http://salmon-protocol.org/ns/salmon-mention',
'href' => $baseURL . '/salmon/' . $owner['nickname'] . '/mention'
]
],
- '11:link' => [
+ '10:link' => [
'@attributes' => [
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
- 'template' => $baseURL . '/follow?url={uri}'
+ 'template' => $baseURL . '/contact/follow?url={uri}'
]
],
- '12:link' => [
+ '11:link' => [
'@attributes' => [
'rel' => 'magic-public-key',
'href' => 'data:application/magic-public-key,' . Salmon::salmonKey($owner['spubkey'])
]
],
- '13:link' => [
+ '12:link' => [
'@attributes' => [
'rel' => 'http://purl.org/openwebauth/v1',
'type' => 'application/x-zot+json',
]
],
],
- ], $xml);
+ ]);
header('Access-Control-Allow-Origin: *');
- System::httpExit($xml->saveXML(), Response::TYPE_XML, 'application/xrd+xml');
+ System::httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml');
}
}