Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index b5c1b4c11523cef1facc9825de8b3c2c7fa3e398..87766ca26e5890d7d33605c82c29d70e517181be 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -12,6 +12,10 @@ use Friendica\Protocol\Salmon;
 function xrd_init(App $a)
 {
        if ($a->argv[0] == 'xrd') {
+               if (empty($_GET['uri'])) {
+                       killme();
+               }
+
                $uri = urldecode(notags(trim($_GET['uri'])));
                if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') {
                        $mode = 'json';
@@ -19,6 +23,10 @@ function xrd_init(App $a)
                        $mode = 'xml';
                }
        } else {
+               if (empty($_GET['resource'])) {
+                       killme();
+               }
+
                $uri = urldecode(notags(trim($_GET['resource'])));
                if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') {
                        $mode = 'xml';
@@ -39,7 +47,7 @@ function xrd_init(App $a)
        }
 
        $user = DBA::selectFirst('user', [], ['nickname' => $name]);
-       if (!DBA::is_result($user)) {
+       if (!DBA::isResult($user)) {
                killme();
        }
 
@@ -84,6 +92,10 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
                        ['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
                ]
        ];
+       if ($r['uid'] == 180) {
+               $json['links'][] = ['rel' => 'self', 'type' => 'application/activity+json', 'href' => $profile_url];
+       }
+
        echo json_encode($json);
        killme();
 }