X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FXrd.php;h=ad2b25902567d238f1d5f663366f162140d9f251;hb=ffa44b8dc0b2ac0d65da245766cf0826e219d9a8;hp=098c1574ea3315c797207c0748f9ae2c6450bafd;hpb=264b8f27fdc31e9e2380d37bead9d9e58a39dc27;p=friendica.git

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 098c1574ea..ad2b259025 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
  *
@@ -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,
@@ -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',
@@ -234,9 +230,7 @@ class Xrd extends BaseModule
 	{
 		$baseURL = $this->baseUrl->get();
 
-		$xml = null;
-
-		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');
 	}
 }