BBCode - fixed syntax error

[friendica.git] / mod / nodeinfo.php

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index ca4a622fbb8e7afd78d334c99960e2c065e5155f..39f430f92f2e249ea37d092c32b34a02b26ba550 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -12,8 +12,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
-require_once 'include/dba.php';
-
 function nodeinfo_wellknown(App $a) {
        $nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
                                        'href' => System::baseUrl().'/nodeinfo/1.0']]];
@@ -26,12 +24,10 @@ function nodeinfo_wellknown(App $a) {
 function nodeinfo_init(App $a) {
        if (!Config::get('system', 'nodeinfo')) {
                System::httpExit(404);
-               killme();
        }
 
        if (($a->argc != 2) || ($a->argv[1] != '1.0')) {
                System::httpExit(404);
-               killme();
        }
 
        $smtp = (function_exists('imap_open') && !Config::get('system', 'imap_disabled') && !Config::get('system', 'dfrn_only'));
@@ -63,7 +59,7 @@ function nodeinfo_init(App $a) {
 
        $nodeinfo['usage'] = [];
 
-       $nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED;
+       $nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED;
 
        $nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')];
 
@@ -85,10 +81,6 @@ function nodeinfo_init(App $a) {
                        $nodeinfo['services']['inbound'][] = 'gnusocial';
                        $nodeinfo['services']['outbound'][] = 'gnusocial';
                }
-
-               if (Addon::isEnabled('gpluspost') || Addon::isEnabled('buffer')) {
-                       $nodeinfo['services']['outbound'][] = 'google';
-               }
                if (Addon::isEnabled('ijpost')) {
                        $nodeinfo['services']['outbound'][] = 'insanejournal';
                }
@@ -147,7 +139,7 @@ function nodeinfo_init(App $a) {
 
 function nodeinfo_cron() {
 
-       $a = get_app();
+       $a = \get_app();
 
        // If the addon 'statistics_json' is enabled then disable it and activate nodeinfo.
        if (Addon::isEnabled('statistics_json')) {
@@ -155,7 +147,6 @@ function nodeinfo_cron() {
 
                $addon = 'statistics_json';
                $addons = Config::get('system', 'addon');
-               $addons_arr = [];
 
                if ($addons) {
                        $addons_arr = explode(',',str_replace(' ', '',$addons));