We now return basic system data via nodeinfo at every time.

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 6f204947579bfafd263019709422f62e1ef40add..5415bac48143938454d0c0decb034a9238df7cc4 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -5,15 +5,13 @@
  * Documentation: http://nodeinfo.diaspora.software/schema.html
 */
 
-require_once("include/plugin.php");
+use \Friendica\Core\Config;
+
+require_once('include/plugin.php');
 
 function nodeinfo_wellknown(App $a) {
-       if (!get_config("system", "nodeinfo")) {
-               http_status_exit(404);
-               killme();
-       }
-       $nodeinfo = array("links" => array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
-                                       "href" => App::get_baseurl()."/nodeinfo/1.0")));
+       $nodeinfo = array('links' => array(array('rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
+                                       'href' => App::get_baseurl().'/nodeinfo/1.0')));
 
        header('Content-type: application/json; charset=utf-8');
        echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
@@ -21,124 +19,127 @@ function nodeinfo_wellknown(App $a) {
 }
 
 function nodeinfo_init(App $a) {
-       if (!get_config("system", "nodeinfo")) {
+       if (!Config::get('system', 'nodeinfo')) {
                http_status_exit(404);
                killme();
        }
 
-       if (($a->argc != 2) OR ($a->argv[1] != "1.0")) {
+       if (($a->argc != 2) OR ($a->argv[1] != '1.0')) {
                http_status_exit(404);
                killme();
        }
 
-       $smtp = (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"));
+       $smtp = (function_exists('imap_open') AND !Config::get('system', 'imap_disabled') AND !Config::get('system', 'dfrn_only'));
 
        $nodeinfo = array();
-       $nodeinfo["version"] = "1.0";
-       $nodeinfo["software"] = array("name" => "friendica", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+       $nodeinfo['version'] = '1.0';
+       $nodeinfo['software'] = array('name' => 'friendica', 'version' => FRIENDICA_VERSION.'-'.DB_UPDATE_VERSION);
 
-       $nodeinfo["protocols"] = array();
-       $nodeinfo["protocols"]["inbound"] = array();
-       $nodeinfo["protocols"]["outbound"] = array();
+       $nodeinfo['protocols'] = array();
+       $nodeinfo['protocols']['inbound'] = array();
+       $nodeinfo['protocols']['outbound'] = array();
 
-       if (get_config("system","diaspora_enabled")) {
-               $nodeinfo["protocols"]["inbound"][] = "diaspora";
-               $nodeinfo["protocols"]["outbound"][] = "diaspora";
+       if (Config::get('system', 'diaspora_enabled')) {
+               $nodeinfo['protocols']['inbound'][] = 'diaspora';
+               $nodeinfo['protocols']['outbound'][] = 'diaspora';
        }
 
-       $nodeinfo["protocols"]["inbound"][] = "friendica";
-       $nodeinfo["protocols"]["outbound"][] = "friendica";
+       $nodeinfo['protocols']['inbound'][] = 'friendica';
+       $nodeinfo['protocols']['outbound'][] = 'friendica';
 
-       if (!get_config("system","ostatus_disabled")) {
-               $nodeinfo["protocols"]["inbound"][] = "gnusocial";
-               $nodeinfo["protocols"]["outbound"][] = "gnusocial";
+       if (!Config::get('system', 'ostatus_disabled')) {
+               $nodeinfo['protocols']['inbound'][] = 'gnusocial';
+               $nodeinfo['protocols']['outbound'][] = 'gnusocial';
        }
 
-       $nodeinfo["services"] = array();
-       $nodeinfo["services"]["inbound"] = array();
-       $nodeinfo["services"]["outbound"] = array();
-
-       $nodeinfo["openRegistrations"] = ($a->config['register_policy'] != 0);
-
-       $nodeinfo["usage"] = array();
-       $nodeinfo["usage"]["users"] = array("total" => (int)get_config("nodeinfo","total_users"),
-                               "activeHalfyear" => (int)get_config("nodeinfo","active_users_halfyear"),
-                               "activeMonth" => (int)get_config("nodeinfo","active_users_monthly"));
-       $nodeinfo["usage"]["localPosts"] = (int)get_config("nodeinfo","local_posts");
-       $nodeinfo["usage"]["localComments"] = (int)get_config("nodeinfo","local_comments");
+       $nodeinfo['services'] = array();
+       $nodeinfo['services']['inbound'] = array();
+       $nodeinfo['services']['outbound'] = array();
 
-       $nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
+       $nodeinfo['usage'] = array();
 
-       if (plugin_enabled("appnet"))
-               $nodeinfo["services"]["inbound"][] = "appnet";
-
-       if (plugin_enabled("appnet") OR plugin_enabled("buffer"))
-               $nodeinfo["services"]["outbound"][] = "appnet";
-
-       if (plugin_enabled("blogger"))
-               $nodeinfo["services"]["outbound"][] = "blogger";
-
-       if (plugin_enabled("dwpost"))
-               $nodeinfo["services"]["outbound"][] = "dreamwidth";
-
-       if (plugin_enabled("fbpost") OR plugin_enabled("buffer"))
-               $nodeinfo["services"]["outbound"][] = "facebook";
-
-       if (plugin_enabled("statusnet")) {
-               $nodeinfo["services"]["inbound"][] = "gnusocial";
-               $nodeinfo["services"]["outbound"][] = "gnusocial";
-       }
+       $nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
 
-       if (plugin_enabled("gpluspost") OR plugin_enabled("buffer"))
-               $nodeinfo["services"]["outbound"][] = "google";
+       $nodeinfo['metadata'] = array('nodeName' => $a->config['sitename']);
 
-       if (plugin_enabled("ijpost"))
-               $nodeinfo["services"]["outbound"][] = "insanejournal";
+       if (Config::get('system', 'nodeinfo')) {
 
-       if (plugin_enabled("libertree"))
-               $nodeinfo["services"]["outbound"][] = "libertree";
+               $nodeinfo['usage']['users'] = array('total' => (int)Config::get('nodeinfo', 'total_users'),
+                                       'activeHalfyear' => (int)Config::get('nodeinfo', 'active_users_halfyear'),
+                                       'activeMonth' => (int)Config::get('nodeinfo', 'active_users_monthly'));
+               $nodeinfo['usage']['localPosts'] = (int)Config::get('nodeinfo', 'local_posts');
+               $nodeinfo['usage']['localComments'] = (int)Config::get('nodeinfo', 'local_comments');
 
-       if (plugin_enabled("buffer"))
-               $nodeinfo["services"]["outbound"][] = "linkedin";
+               if (plugin_enabled('appnet')) {
+                       $nodeinfo['services']['inbound'][] = 'appnet';
+               }
+               if (plugin_enabled('appnet') OR plugin_enabled('buffer')) {
+                       $nodeinfo['services']['outbound'][] = 'appnet';
+               }
+               if (plugin_enabled('blogger')) {
+                       $nodeinfo['services']['outbound'][] = 'blogger';
+               }
+               if (plugin_enabled('dwpost')) {
+                       $nodeinfo['services']['outbound'][] = 'dreamwidth';
+               }
+               if (plugin_enabled('fbpost') OR plugin_enabled('buffer')) {
+                       $nodeinfo['services']['outbound'][] = 'facebook';
+               }
+               if (plugin_enabled('statusnet')) {
+                       $nodeinfo['services']['inbound'][] = 'gnusocial';
+                       $nodeinfo['services']['outbound'][] = 'gnusocial';
+               }
 
-       if (plugin_enabled("ljpost"))
-               $nodeinfo["services"]["outbound"][] = "livejournal";
+               if (plugin_enabled('gpluspost') OR plugin_enabled('buffer')) {
+                       $nodeinfo['services']['outbound'][] = 'google';
+               }
+               if (plugin_enabled('ijpost')) {
+                       $nodeinfo['services']['outbound'][] = 'insanejournal';
+               }
+               if (plugin_enabled('libertree')) {
+                       $nodeinfo['services']['outbound'][] = 'libertree';
+               }
+               if (plugin_enabled('buffer')) {
+                       $nodeinfo['services']['outbound'][] = 'linkedin';
+               }
+               if (plugin_enabled('ljpost')) {
+                       $nodeinfo['services']['outbound'][] = 'livejournal';
+               }
+               if (plugin_enabled('buffer')) {
+                       $nodeinfo['services']['outbound'][] = 'pinterest';
+               }
+               if (plugin_enabled('posterous')) {
+                       $nodeinfo['services']['outbound'][] = 'posterous';
+               }
+               if (plugin_enabled('pumpio')) {
+                       $nodeinfo['services']['inbound'][] = 'pumpio';
+                       $nodeinfo['services']['outbound'][] = 'pumpio';
+               }
 
-       if (plugin_enabled("buffer"))
-               $nodeinfo["services"]["outbound"][] = "pinterest";
+               if ($smtp) {
+                       $nodeinfo['services']['outbound'][] = 'smtp';
+               }
+               if (plugin_enabled('tumblr')) {
+                       $nodeinfo['services']['outbound'][] = 'tumblr';
+               }
+               if (plugin_enabled('twitter') OR plugin_enabled('buffer')) {
+                       $nodeinfo['services']['outbound'][] = 'twitter';
+               }
+               if (plugin_enabled('wppost')) {
+                       $nodeinfo['services']['outbound'][] = 'wordpress';
+               }
+               $nodeinfo['metadata']['protocols'] = $nodeinfo['protocols'];
+               $nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0';
+               $nodeinfo['metadata']['protocols']['inbound'][] = 'atom1.0';
+               $nodeinfo['metadata']['protocols']['inbound'][] = 'rss2.0';
 
-       if (plugin_enabled("posterous"))
-               $nodeinfo["services"]["outbound"][] = "posterous";
+               $nodeinfo['metadata']['services'] = $nodeinfo['services'];
 
-       if (plugin_enabled("pumpio")) {
-               $nodeinfo["services"]["inbound"][] = "pumpio";
-               $nodeinfo["services"]["outbound"][] = "pumpio";
+               if (plugin_enabled('twitter')) {
+                       $nodeinfo['metadata']['services']['inbound'][] = 'twitter';
+               }
        }
 
-       // redmatrix
-
-       if ($smtp)
-               $nodeinfo["services"]["outbound"][] = "smtp";
-
-       if (plugin_enabled("tumblr"))
-               $nodeinfo["services"]["outbound"][] = "tumblr";
-
-       if (plugin_enabled("twitter") OR plugin_enabled("buffer"))
-               $nodeinfo["services"]["outbound"][] = "twitter";
-
-       if (plugin_enabled("wppost"))
-               $nodeinfo["services"]["outbound"][] = "wordpress";
-
-       $nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"];
-       $nodeinfo["metadata"]["protocols"]["outbound"][] = "atom1.0";
-       $nodeinfo["metadata"]["protocols"]["inbound"][] = "atom1.0";
-       $nodeinfo["metadata"]["protocols"]["inbound"][] = "rss2.0";
-
-       $nodeinfo["metadata"]["services"] = $nodeinfo["services"];
-
-       if (plugin_enabled("twitter"))
-               $nodeinfo["metadata"]["services"]["inbound"][] = "twitter";
-
        header('Content-type: application/json; charset=utf-8');
        echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
        exit;
@@ -150,40 +151,40 @@ function nodeinfo_cron() {
 
        $a = get_app();
 
-       // If the plugin "statistics_json" is enabled then disable it and actrivate nodeinfo.
-       if (plugin_enabled("statistics_json")) {
-               set_config("system", "nodeinfo", true);
+       // If the plugin 'statistics_json' is enabled then disable it and actrivate nodeinfo.
+       if (plugin_enabled('statistics_json')) {
+               Config::set('system', 'nodeinfo', true);
 
-               $plugin = "statistics_json";
-               $plugins = get_config("system","addon");
+               $plugin = 'statistics_json';
+               $plugins = Config::get('system', 'addon');
                $plugins_arr = array();
 
-               if($plugins) {
-                       $plugins_arr = explode(",",str_replace(" ", "",$plugins));
+               if ($plugins) {
+                       $plugins_arr = explode(',',str_replace(' ', '',$plugins));
 
                        $idx = array_search($plugin, $plugins_arr);
-                       if ($idx !== false){
+                       if ($idx !== false) {
                                unset($plugins_arr[$idx]);
                                uninstall_plugin($plugin);
-                               set_config("system","addon", implode(", ",$plugins_arr));
+                               Config::set('system', 'addon', implode(', ',$plugins_arr));
                        }
                }
        }
 
-       if (!get_config("system", "nodeinfo"))
+       if (!Config::get('system', 'nodeinfo')) {
                return;
+       }
+       $last = Config::get('nodeinfo', 'last_calucation');
 
-       $last = get_config('nodeinfo','last_calucation');
-
-       if($last) {
+       if ($last) {
                // Calculate every 24 hours
                $next = $last + (24 * 60 * 60);
-               if($next > time()) {
-                       logger("calculation intervall not reached");
+               if ($next > time()) {
+                       logger('calculation intervall not reached');
                        return;
                }
        }
-        logger("cron_start");
+        logger('cron_start');
 
        $users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
                        FROM `user`
@@ -202,31 +203,31 @@ function nodeinfo_cron() {
 
                        foreach ($users AS $user) {
                                if ((strtotime($user['login_date']) > $halfyear) OR
-                                       (strtotime($user['last-item']) > $halfyear))
+                                       (strtotime($user['last-item']) > $halfyear)) {
                                        ++$active_users_halfyear;
-
+                               }
                                if ((strtotime($user['login_date']) > $month) OR
-                                       (strtotime($user['last-item']) > $month))
+                                       (strtotime($user['last-item']) > $month)) {
                                        ++$active_users_monthly;
-
+                               }
                        }
-                       set_config('nodeinfo','total_users', $total_users);
-                       logger("total_users: ".$total_users, LOGGER_DEBUG);
+                       Config::set('nodeinfo', 'total_users', $total_users);
+                       logger('total_users: '.$total_users, LOGGER_DEBUG);
 
-                       set_config('nodeinfo','active_users_halfyear', $active_users_halfyear);
-                       set_config('nodeinfo','active_users_monthly', $active_users_monthly);
+                       Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
+                       Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);
        }
 
        $posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
 
-       if (!is_array($posts))
+       if (!is_array($posts)) {
                $local_posts = -1;
-       else
-               $local_posts = $posts[0]["local_posts"];
-
-       set_config('nodeinfo','local_posts', $local_posts);
+       } else {
+               $local_posts = $posts[0]['local_posts'];
+       }
+       Config::set('nodeinfo', 'local_posts', $local_posts);
 
-        logger("local_posts: ".$local_posts, LOGGER_DEBUG);
+        logger('local_posts: '.$local_posts, LOGGER_DEBUG);
 
        $posts = qu("SELECT COUNT(*) FROM `contact`
                        INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND
@@ -234,21 +235,21 @@ function nodeinfo_cron() {
                        WHERE `contact`.`self`",
                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
 
-       if (!is_array($posts))
+       if (!is_array($posts)) {
                $local_comments = -1;
-       else
-               $local_comments = $posts[0]["local_comments"];
-
-       set_config('nodeinfo','local_comments', $local_comments);
+       } else {
+               $local_comments = $posts[0]['local_comments'];
+       }
+       Config::set('nodeinfo', 'local_comments', $local_comments);
 
        // Now trying to register
-       $url = "http://the-federation.info/register/".$a->get_hostname();
+       $url = 'http://the-federation.info/register/'.$a->get_hostname();
         logger('registering url: '.$url, LOGGER_DEBUG);
        $ret = fetch_url($url);
         logger('registering answer: '.$ret, LOGGER_DEBUG);
 
-        logger("cron_end");
-       set_config('nodeinfo','last_calucation', time());
+        logger('cron_end');
+       Config::set('nodeinfo', 'last_calucation', time());
 }
 
 ?>