Rewrite Proxy module

[friendica.git] / mod / _well_known.php

diff --git a/mod/_well_known.php b/mod/_well_known.php
index 4b37c0b97f05fb162fd424a27c94d7144dcecba8..407fc756a931fef7cfe0a39adc79816def46b1b6 100644 (file)
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -2,10 +2,11 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\System;
 
-require_once("mod/hostxrd.php");
-require_once("mod/nodeinfo.php");
-require_once("mod/xrd.php");
+require_once 'mod/hostxrd.php';
+require_once 'mod/nodeinfo.php';
+require_once 'mod/xrd.php';
 
 function _well_known_init(App $a)
 {
@@ -25,7 +26,7 @@ function _well_known_init(App $a)
                                break;
                }
        }
-       http_status_exit(404);
+       System::httpExit(404);
        killme();
 }
 
@@ -45,8 +46,10 @@ function wk_social_relay()
                $server_tags = Config::get('system', 'relay_server_tags');
                $tagitems = explode(",", $server_tags);
 
+               /// @todo Check if it was better to use "strtolower" on the tags
                foreach ($tagitems AS $tag) {
-                       $tags[trim($tag, "# ")] = trim($tag, "# ");
+                       $tag = trim($tag, "# ");
+                       $tags[$tag] = $tag;
                }
 
                if (Config::get('system', 'relay_user_tags')) {
@@ -61,13 +64,17 @@ function wk_social_relay()
 
        $taglist = [];
        foreach ($tags AS $tag) {
-               $taglist[] = $tag;
+               if (!empty($tag)) {
+                       $taglist[] = $tag;
+               }
        }
 
        $relay = [
-               "subscribe" => $subscribe,
-               "scope" => $scope,
-               "tags" => $taglist
+               'subscribe' => $subscribe,
+               'scope' => $scope,
+               'tags' => $taglist,
+               'protocols' => ['diaspora' => ['receive' => System::baseUrl() . '/receive/public'],
+                       'dfrn' => ['receive' => System::baseUrl() . '/dfrn_notify']]
        ];
 
        header('Content-type: application/json; charset=utf-8');