X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FNodeInfo120.php;h=a5547be3fb9f4f44aa547912f9c1478c297aa65c;hb=4246ffc892d13fc7dd0057d8358fcacc44da5048;hp=7ff7282d14dccffd9573108c1596c0e2dbb4234d;hpb=054c301ef0345c4ff9f35cfd08717757eab17b9d;p=friendica.git diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php index 7ff7282d14..a5547be3fb 100644 --- a/src/Module/NodeInfo120.php +++ b/src/Module/NodeInfo120.php @@ -1,6 +1,6 @@ config = $config; + } + protected function rawContent(array $request = []) + { $nodeinfo = [ - 'version' => '2.0', - 'software' => [ + 'version' => '2.0', + 'software' => [ 'name' => 'friendica', - 'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION, + 'version' => App::VERSION . '-' . DB_UPDATE_VERSION, ], 'protocols' => ['dfrn', 'activitypub'], - 'services' => [], - 'usage' => [], - 'openRegistrations' => intval($config->get('config', 'register_policy')) !== Register::CLOSED, + 'services' => Nodeinfo::getServices(), + 'usage' => Nodeinfo::getUsage(), + 'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED, 'metadata' => [ - 'nodeName' => $config->get('config', 'sitename'), + 'nodeName' => $this->config->get('config', 'sitename'), ], ]; - if (!empty($config->get('system', 'diaspora_enabled'))) { + if (!empty($this->config->get('system', 'diaspora_enabled'))) { $nodeinfo['protocols'][] = 'diaspora'; } - if (empty($config->get('system', 'ostatus_disabled'))) { + if (empty($this->config->get('system', 'ostatus_disabled'))) { $nodeinfo['protocols'][] = 'ostatus'; } - $nodeinfo['usage'] = Nodeinfo::getUsage(); - - $nodeinfo['services'] = Nodeinfo::getServices(); - if (Addon::isEnabled('twitter')) { $nodeinfo['services']['inbound'][] = 'twitter'; } @@ -72,12 +80,13 @@ class NodeInfo120 extends BaseModule $nodeinfo['services']['inbound'][] = 'rss2.0'; $nodeinfo['services']['outbound'][] = 'atom1.0'; - if (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only')) { + if (function_exists('imap_open') && !$this->config->get('system', 'imap_disabled')) { $nodeinfo['services']['inbound'][] = 'imap'; } - $nodeinfo['metadata']['explicitContent'] = $config->get('system', 'explicit_content', false) == true; + $nodeinfo['metadata']['explicitContent'] = $this->config->get('system', 'explicit_content', false) == true; - System::jsonExit($nodeinfo, 'application/json; charset=utf-8', JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); + $this->response->setType(ICanCreateResponses::TYPE_JSON, 'application/json; charset=utf-8'); + $this->response->addContent(json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); } }