X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FXrd.php;h=098d69e23cb2b579879977f5b97bbf585470c666;hb=1d6f5c33a1a7c538d4e529d22701fd735855da15;hp=b12e94a290df3850431a86ca117158bac7e6d0a3;hpb=636325efcc01ecfe080dd9a4eb4e4c6f380683b5;p=friendica.git

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index b12e94a290..098d69e23c 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -1,6 +1,6 @@
 <?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
  *
@@ -83,7 +83,7 @@ class Xrd extends BaseModule
 		} 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);
 			}
 
@@ -105,7 +105,7 @@ class Xrd extends BaseModule
 
 	private function printSystemJSON(array $owner)
 	{
-		$baseURL = $this->baseUrl->get();
+		$baseURL = $this->baseUrl;
 		$json = [
 			'subject' => 'acct:' . $owner['addr'],
 			'aliases' => [$owner['url']],
@@ -122,7 +122,7 @@ class Xrd extends BaseModule
 				],
 				[
 					'rel'      => 'http://ostatus.org/schema/1.0/subscribe',
-					'template' => $baseURL . '/follow?url={uri}',
+					'template' => $baseURL . '/contact/follow?url={uri}',
 				],
 				[
 					'rel'  => ActivityNamespace::FEED,
@@ -151,7 +151,7 @@ class Xrd extends BaseModule
 
 	private function printJSON(string $alias, array $owner, array $avatar)
 	{
-		$baseURL = $this->baseUrl->get();
+		$baseURL = $this->baseUrl;
 
 		$json = [
 			'subject' => 'acct:' . $owner['addr'],
@@ -184,10 +184,6 @@ class Xrd extends BaseModule
 					'type' => 'text/html',
 					'href' => $baseURL . '/hcard/' . $owner['nickname'],
 				],
-				[
-					'rel'  => ActivityNamespace::POCO,
-					'href' => $owner['poco'],
-				],
 				[
 					'rel'  => 'http://webfinger.net/rel/avatar',
 					'type' => $avatar['type'],
@@ -212,7 +208,7 @@ class Xrd extends BaseModule
 				],
 				[
 					'rel'      => 'http://ostatus.org/schema/1.0/subscribe',
-					'template' => $baseURL . '/follow?url={uri}',
+					'template' => $baseURL . '/contact/follow?url={uri}',
 				],
 				[
 					'rel'  => 'magic-public-key',
@@ -232,11 +228,9 @@ class Xrd extends BaseModule
 
 	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',
@@ -272,56 +266,50 @@ class Xrd extends BaseModule
 					]
 				],
 				'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',
@@ -329,10 +317,10 @@ class Xrd extends BaseModule
 					]
 				],
 			],
-		], $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');
 	}
 }