Merge pull request #3149 from annando/1601-new-diaspora-mention

[friendica.git] / mod / _well_known.php

diff --git a/mod/_well_known.php b/mod/_well_known.php
index 3d722f72246e764e853ce8a8bb184aaebb7f2067..75948a008834abf70279834a1911dbe39a913f96 100644 (file)
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -1,7 +1,9 @@
 <?php\r
+/// @TODO This file has DOS line endings!\r
 require_once("mod/hostxrd.php");\r
+require_once("mod/nodeinfo.php");\r
 \r
-function _well_known_init(&$a){\r
+function _well_known_init(App $a) {\r
        if ($a->argc > 1) {\r
                switch($a->argv[1]) {\r
                        case "host-meta":\r
@@ -10,13 +12,16 @@ function _well_known_init(&$a){
                        case "x-social-relay":\r
                                wk_social_relay($a);\r
                                break;\r
+                       case "nodeinfo":\r
+                               nodeinfo_wellknown($a);\r
+                               break;\r
                }\r
        }\r
        http_status_exit(404);\r
        killme();\r
 }\r
 \r
-function wk_social_relay(&$a) {\r
+function wk_social_relay(App $a) {\r
 \r
        define('SR_SCOPE_ALL', 'all');\r
        define('SR_SCOPE_TAGS', 'tags');\r
@@ -57,6 +62,6 @@ function wk_social_relay(&$a) {
                        "tags" => $taglist);\r
 \r
        header('Content-type: application/json; charset=utf-8');\r
-       echo json_encode($relay, true);\r
+       echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);\r
        exit;\r
 }\r