X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FXrd.php;h=d24628ce65652f81ae76fd466f2477279ba052ce;hb=733f3de9ed0955035898646972ae18cbff5b45d3;hp=d2813cc270ae0d39c479bc79e9cb4cd348651aea;hpb=a26a2a0228e13acc0d227f94b352028a2c6b24a7;p=friendica.git

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index d2813cc270..d24628ce65 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,19 +26,17 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\Salmon;
-use Friendica\Util\Strings;
 
 /**
  * Prints responses to /.well-known/webfinger  or /xrd requests
  */
 class Xrd extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
 		// @TODO: Replace with parameter from router
 		if (DI::args()->getArgv()[0] == 'xrd') {
@@ -46,8 +44,8 @@ class Xrd extends BaseModule
 				return;
 			}
 
-			$uri = urldecode(Strings::escapeTags(trim($_GET['uri'])));
-			if (($_SERVER['HTTP_ACCEPT'] ?? '') == 'application/jrd+json') {
+			$uri = urldecode(trim($_GET['uri']));
+			if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/jrd+json') !== false)  {
 				$mode = 'json';
 			} else {
 				$mode = 'xml';
@@ -57,8 +55,8 @@ class Xrd extends BaseModule
 				return;
 			}
 
-			$uri = urldecode(Strings::escapeTags(trim($_GET['resource'])));
-			if (($_SERVER['HTTP_ACCEPT'] ?? '') == 'application/xrd+xml') {
+			$uri = urldecode(trim($_GET['resource']));
+			if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/xrd+xml') !== false)  {
 				$mode = 'xml';
 			} else {
 				$mode = 'json';
@@ -159,9 +157,6 @@ class Xrd extends BaseModule
 	{
 		$salmon_key = Salmon::salmonKey($owner['spubkey']);
 
-		header('Access-Control-Allow-Origin: *');
-		header('Content-type: application/json; charset=utf-8');
-
 		$json = [
 			'subject' => 'acct:' . $owner['addr'],
 			'aliases' => [
@@ -200,7 +195,7 @@ class Xrd extends BaseModule
 				[
 					'rel'  => 'http://webfinger.net/rel/avatar',
 					'type' => $avatar['type'],
-					'href' => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
+					'href' => User::getAvatarUrl($owner),
 				],
 				[
 					'rel'  => 'http://joindiaspora.com/seed_location',
@@ -235,8 +230,8 @@ class Xrd extends BaseModule
 			],
 		];
 
-		echo json_encode($json);
-		exit();
+		header('Access-Control-Allow-Origin: *');
+		System::jsonExit($json, 'application/jrd+json; charset=utf-8');
 	}
 
 	private static function printXML($alias, $baseURL, $user, $owner, $avatar)
@@ -256,7 +251,7 @@ class Xrd extends BaseModule
 			'$hcard_url'   => $baseURL . '/hcard/' . $owner['nickname'],
 			'$atom'        => $owner['poll'],
 			'$poco_url'    => $owner['poco'],
-			'$photo'       => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
+			'$photo'       => User::getAvatarUrl($owner),
 			'$type'        => $avatar['type'],
 			'$salmon'      => $baseURL . '/salmon/' . $owner['nickname'],
 			'$salmen'      => $baseURL . '/salmon/' . $owner['nickname'] . '/mention',