Merge pull request #12478 from MrPetovan/bug/12476-profiles-inaccessible

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

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index b12e94a290df3850431a86ca117158bac7e6d0a3..29641482f625b86a41a1a7050a6fcb98e89c9c58 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -83,7 +83,7 @@ class Xrd extends BaseModule
                } else {
                        $owner = User::getOwnerDataByNick($name);
                        if (empty($owner)) {
-                               DI::logger()->warning('No owner data for user id', ['uri' => $uri, 'name' => $name]);
+                               DI::logger()->notice('No owner data for user id', ['uri' => $uri, 'name' => $name]);
                                throw new NotFoundException('Owner was not found for user->uid=' . $name);
                        }
 
@@ -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',
@@ -272,56 +268,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',