Merge branch 'develop' of https://github.com/Hypolite/friendica into develop

[friendica.git] / mod / _well_known.php

diff --git a/mod/_well_known.php b/mod/_well_known.php
index 6c33136f957a2576bf8a121404782aa23ece0f03..622d7fd93f647e9838e29af57f3649b8f5f02828 100644 (file)
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -1,70 +1,68 @@
-<?php\r
-require_once("mod/hostxrd.php");\r
-require_once("mod/nodeinfo.php");\r
-\r
-if(! function_exists('_well_known_init')) {\r
-function _well_known_init(&$a){\r
-       if ($a->argc > 1) {\r
-               switch($a->argv[1]) {\r
-                       case "host-meta":\r
-                               hostxrd_init($a);\r
-                               break;\r
-                       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
-\r
-if(! function_exists('wk_social_relay')) {\r
-function wk_social_relay(&$a) {\r
-\r
-       define('SR_SCOPE_ALL', 'all');\r
-       define('SR_SCOPE_TAGS', 'tags');\r
-\r
-       $subscribe = (bool)get_config('system', 'relay_subscribe');\r
-\r
-       if ($subscribe)\r
-               $scope = get_config('system', 'relay_scope');\r
-       else\r
-               $scope = "";\r
-\r
-       $tags = array();\r
-\r
-       if ($scope == SR_SCOPE_TAGS) {\r
-\r
-               $server_tags = get_config('system', 'relay_server_tags');\r
-               $tagitems = explode(",", $server_tags);\r
-\r
-               foreach($tagitems AS $tag)\r
-                       $tags[trim($tag, "# ")] = trim($tag, "# ");\r
-\r
-               if (get_config('system', 'relay_user_tags')) {\r
-                       $terms = q("SELECT DISTINCT(`term`) FROM `search`");\r
-\r
-                       foreach($terms AS $term) {\r
-                               $tag = trim($term["term"], "#");\r
-                               $tags[$tag] = $tag;\r
-                       }\r
-               }\r
-       }\r
-\r
-       $taglist = array();\r
-       foreach($tags AS $tag)\r
-               $taglist[] = $tag;\r
-\r
-       $relay = array("subscribe" => $subscribe,\r
-                       "scope" => $scope,\r
-                       "tags" => $taglist);\r
-\r
-       header('Content-type: application/json; charset=utf-8');\r
-       echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);\r
-       exit;\r
-}\r
-}\r
+<?php
+
+use \Friendica\Core\Config;
+
+require_once("mod/hostxrd.php");
+require_once("mod/nodeinfo.php");
+
+function _well_known_init(App $a) {
+       if ($a->argc > 1) {
+               switch($a->argv[1]) {
+                       case "host-meta":
+                               hostxrd_init($a);
+                               break;
+                       case "x-social-relay":
+                               wk_social_relay($a);
+                               break;
+                       case "nodeinfo":
+                               nodeinfo_wellknown($a);
+                               break;
+               }
+       }
+       http_status_exit(404);
+       killme();
+}
+
+function wk_social_relay(App $a) {
+
+       $subscribe = (bool)Config::get('system', 'relay_subscribe', false);
+
+       if ($subscribe) {
+               $scope = Config::get('system', 'relay_scope', SR_SCOPE_ALL);
+       } else {
+               $scope = SR_SCOPE_NONE;
+       }
+
+       $tags = array();
+
+       if ($scope == SR_SCOPE_TAGS) {
+               $server_tags = Config::get('system', 'relay_server_tags');
+               $tagitems = explode(",", $server_tags);
+
+               foreach($tagitems AS $tag) {
+                       $tags[trim($tag, "# ")] = trim($tag, "# ");
+               }
+
+               if (Config::get('system', 'relay_user_tags')) {
+                       $terms = q("SELECT DISTINCT(`term`) FROM `search`");
+
+                       foreach($terms AS $term) {
+                               $tag = trim($term["term"], "#");
+                               $tags[$tag] = $tag;
+                       }
+               }
+       }
+
+       $taglist = array();
+       foreach($tags AS $tag) {
+               $taglist[] = $tag;
+       }
+
+       $relay = array("subscribe" => $subscribe,
+                       "scope" => $scope,
+                       "tags" => $taglist);
+
+       header('Content-type: application/json; charset=utf-8');
+       echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+       exit;
+}