Merge pull request #9959 from annando/more-database-stuff

[friendica.git] / src / Module / NodeInfo120.php

diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php
index 330c5e10d5f160ef80c83f14e7dcf56864021f96..9d02a4b54b6360b6d49b4cc4b8add090ed809381 100644 (file)
--- a/src/Module/NodeInfo120.php
+++ b/src/Module/NodeInfo120.php
@@ -23,6 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Nodeinfo;
 
@@ -36,8 +37,6 @@ class NodeInfo120 extends BaseModule
        {
                $config = DI::config();
 
-               $imap = (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only'));
-
                $nodeinfo = [
                        'version'           => '2.0',
                        'software'          => [
@@ -73,14 +72,12 @@ class NodeInfo120 extends BaseModule
                $nodeinfo['services']['inbound'][]  = 'rss2.0';
                $nodeinfo['services']['outbound'][] = 'atom1.0';
 
-               if ($imap) {
+               if (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only')) {
                        $nodeinfo['services']['inbound'][] = 'imap';
                }
 
                $nodeinfo['metadata']['explicitContent'] = $config->get('system', 'explicit_content', false) == true;
 
-               header('Content-type: application/json; charset=utf-8');
-               echo json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-               exit;
+               System::jsonExit($nodeinfo, 'application/json; charset=utf-8', JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
        }
 }