Merge pull request #11402 from annando/featured-endpoint

[friendica.git] / src / Module / Xrd.php

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index aa7e04ebcd8097b7e721889d94c4089feb81fa00..3d8f50fc21d00285715c62e04a7983b57e56b5d2 100644 (file)
--- 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,22 +44,22 @@ class Xrd extends BaseModule
                                return;
                        }
 
-                       $uri = urldecode(Strings::escapeTags(trim($_GET['uri'])));
+                       $uri = urldecode(trim($_GET['uri']));
                        if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/jrd+json') !== false)  {
-                               $mode = 'json';
+                               $mode = Response::TYPE_JSON;
                        } else {
-                               $mode = 'xml';
+                               $mode = Response::TYPE_XML;
                        }
                } else {
                        if (empty($_GET['resource'])) {
                                return;
                        }
 
-                       $uri = urldecode(Strings::escapeTags(trim($_GET['resource'])));
+                       $uri = urldecode(trim($_GET['resource']));
                        if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/xrd+xml') !== false)  {
-                               $mode = 'xml';
+                               $mode = Response::TYPE_XML;
                        } else {
-                               $mode = 'json';
+                               $mode = Response::TYPE_JSON;
                        }
                }
 
@@ -103,7 +101,7 @@ class Xrd extends BaseModule
                        $avatar = ['type' => 'image/jpeg'];
                }
 
-               if ($mode == 'xml') {
+               if ($mode == Response::TYPE_JSON) {
                        self::printXML($alias, DI::baseUrl()->get(), $user, $owner, $avatar);
                } else {
                        self::printJSON($alias, DI::baseUrl()->get(), $owner, $avatar);
@@ -197,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',
@@ -240,9 +238,6 @@ class Xrd extends BaseModule
        {
                $salmon_key = Salmon::salmonKey($owner['spubkey']);
 
-               header('Access-Control-Allow-Origin: *');
-               header('Content-type: text/xml');
-
                $tpl = Renderer::getMarkupTemplate('xrd_person.tpl');
 
                $o = Renderer::replaceMacros($tpl, [
@@ -253,7 +248,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',
@@ -265,7 +260,8 @@ class Xrd extends BaseModule
                $arr = ['user' => $user, 'xml' => $o];
                Hook::callAll('personal_xrd', $arr);
 
-               echo $arr['xml'];
-               exit();
+               header('Access-Control-Allow-Origin: *');
+
+               System::httpExit($arr['xml'], Response::TYPE_XML, 'application/xrd+xml');
        }
 }