Remove join profile table

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

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 0618a5de6da3ffbc67c080b879a2da51f746d77f..0048350be8a579c85ee9ee6f346273b5bdf5d424 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -4,11 +4,12 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Database\DBA;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Model\User;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Photo;
+use Friendica\Model\User;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Strings;
 
@@ -17,9 +18,9 @@ use Friendica\Util\Strings;
  */
 class Xrd extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
-               $app = self::getApp();
+               $app = DI::app();
 
                // @TODO: Replace with parameter from router
                if ($app->argv[0] == 'xrd') {
@@ -28,7 +29,7 @@ class Xrd extends BaseModule
                        }
 
                        $uri = urldecode(Strings::escapeTags(trim($_GET['uri'])));
-                       if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') {
+                       if (($_SERVER['HTTP_ACCEPT'] ?? '') == 'application/jrd+json') {
                                $mode = 'json';
                        } else {
                                $mode = 'xml';
@@ -39,7 +40,7 @@ class Xrd extends BaseModule
                        }
 
                        $uri = urldecode(Strings::escapeTags(trim($_GET['resource'])));
-                       if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') {
+                       if (($_SERVER['HTTP_ACCEPT'] ?? '') == 'application/xrd+xml') {
                                $mode = 'xml';
                        } else {
                                $mode = 'json';
@@ -74,9 +75,9 @@ class Xrd extends BaseModule
                }
 
                if ($mode == 'xml') {
-                       self::printXML($alias, $app->getBaseURL(), $user, $owner, $avatar);
+                       self::printXML($alias, DI::baseUrl()->get(), $user, $owner, $avatar);
                } else {
-                       self::printJSON($alias, $app->getBaseURL(), $owner, $avatar);
+                       self::printJSON($alias, DI::baseUrl()->get(), $owner, $avatar);
                }
        }
 
@@ -95,13 +96,13 @@ class Xrd extends BaseModule
                        ],
                        'links'   => [
                                [
-                                       'rel'  => NAMESPACE_DFRN,
+                                       'rel'  => ActivityNamespace::DFRN ,
                                        'href' => $owner['url'],
                                ],
                                [
-                                       'rel'  => NAMESPACE_FEED,
+                                       'rel'  => ActivityNamespace::FEED,
                                        'type' => 'application/atom+xml',
-                                       'href' => $owner['notify'],
+                                       'href' => $owner['poll'],
                                ],
                                [
                                        'rel'  => 'http://webfinger.net/rel/profile-page',
@@ -119,7 +120,7 @@ class Xrd extends BaseModule
                                        'href' => $baseURL . '/hcard/' . $owner['nickname'],
                                ],
                                [
-                                       'rel'  => NAMESPACE_POCO,
+                                       'rel'  => ActivityNamespace::POCO,
                                        'href' => $owner['poco'],
                                ],
                                [
@@ -179,7 +180,7 @@ class Xrd extends BaseModule
                        '$alias'       => $alias,
                        '$profile_url' => $owner['url'],
                        '$hcard_url'   => $baseURL . '/hcard/' . $owner['nickname'],
-                       '$atom'        => $owner['notify'],
+                       '$atom'        => $owner['poll'],
                        '$poco_url'    => $owner['poco'],
                        '$photo'       => $owner['photo'],
                        '$type'        => $avatar['type'],