Merge pull request #7848 from annando/mail-hooks

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

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index ae020d35546add6ee2b72c823960c76dbea50b56..79e0883a872bf10dd026cf8c33f7f374bb8d8c29 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -4,11 +4,11 @@ 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\Model\Photo;
+use Friendica\Model\User;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Strings;
 
@@ -17,7 +17,7 @@ use Friendica\Util\Strings;
  */
 class Xrd extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
                $app = self::getApp();
 
@@ -28,7 +28,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 +39,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';
@@ -95,11 +95,11 @@ 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['poll'],
                                ],
@@ -119,7 +119,7 @@ class Xrd extends BaseModule
                                        'href' => $baseURL . '/hcard/' . $owner['nickname'],
                                ],
                                [
-                                       'rel'  => NAMESPACE_POCO,
+                                       'rel'  => ActivityNamespace::POCO,
                                        'href' => $owner['poco'],
                                ],
                                [