X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnodeinfo.php;h=f013c9084ff9c813ae18a91d0edf239451f890fd;hb=7d0ea70cc144bf52070372a617497a7aa5216af2;hp=f9211fe9e56390f5e4e316d7e708439beeefb451;hpb=e60456fb6644510506d8852fa796bb32cf1f3331;p=friendica.git

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index f9211fe9e5..f013c9084f 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -3,13 +3,15 @@
 Documentation: http://nodeinfo.diaspora.software/schema.html
 */
 
+require_once("include/plugin.php");
+
 function nodeinfo_wellknown(&$a) {
 	if (!get_config("system", "nodeinfo")) {
 		http_status_exit(404);
 		killme();
 	}
-	$nodeinfo = array("links" => array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
-					"href" => $a->get_baseurl()."/nodeinfo/1.0"));
+	$nodeinfo = array("links" => array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
+					"href" => $a->get_baseurl()."/nodeinfo/1.0")));
 
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
@@ -50,70 +52,90 @@ function nodeinfo_init(&$a){
 		$nodeinfo["protocols"]["outbound"][] = "gnusocial";
 	}
 
-	if ($smtp) {
-		$nodeinfo["protocols"]["inbound"][] = "smtp";
-		$nodeinfo["protocols"]["outbound"][] = "smtp";
-	}
-
 	$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["metadata"] = array("nodeName" => $a->config["sitename"]);
+
+	if (nodeinfo_plugin_enabled("appnet"))
+		$nodeinfo["services"]["inbound"][] = "appnet";
 
 	if (nodeinfo_plugin_enabled("appnet") OR nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "appnet";
+		$nodeinfo["services"]["outbound"][] = "appnet";
 
 	if (nodeinfo_plugin_enabled("blogger"))
-		$nodeinfo["services"][] = "blogger";
-
-	if (get_config("system","diaspora_enabled"))
-		$nodeinfo["services"][] = "diaspora";
+		$nodeinfo["services"]["outbound"][] = "blogger";
 
-	if (nodeinfo_plugin_enabled("dreamwidth"))
-		$nodeinfo["services"][] = "dreamwidth";
+	if (nodeinfo_plugin_enabled("dwpost"))
+		$nodeinfo["services"]["outbound"][] = "dreamwidth";
 
 	if (nodeinfo_plugin_enabled("fbpost") OR nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "facebook";
+		$nodeinfo["services"]["outbound"][] = "facebook";
 
-	$nodeinfo["services"][] = "friendica";
+	if (nodeinfo_plugin_enabled("statusnet")) {
+		$nodeinfo["services"]["inbound"][] = "gnusocial";
+		$nodeinfo["services"]["outbound"][] = "gnusocial";
+	}
 
-	if (nodeinfo_plugin_enabled("statusnet") OR !get_config("system","ostatus_disabled"))
-		$nodeinfo["services"][] = "gnusocial";
+	if (nodeinfo_plugin_enabled("gpluspost") OR nodeinfo_plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "google";
 
-	if (nodeinfo_plugin_enabled("fpluspost") OR nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "google";
+	if (nodeinfo_plugin_enabled("ijpost"))
+		$nodeinfo["services"]["outbound"][] = "insanejournal";
 
 	if (nodeinfo_plugin_enabled("libertree"))
-		$nodeinfo["services"][] = "libertree";
+		$nodeinfo["services"]["outbound"][] = "libertree";
 
 	if (nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "linkedin";
+		$nodeinfo["services"]["outbound"][] = "linkedin";
 
 	if (nodeinfo_plugin_enabled("ljpost"))
-		$nodeinfo["services"][] = "livejournal";
+		$nodeinfo["services"]["outbound"][] = "livejournal";
+
+	if (nodeinfo_plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "pinterest";
 
-	if (nodeinfo_plugin_enabled("pumpio"))
-		$nodeinfo["services"][] = "pumpio";
+	if (nodeinfo_plugin_enabled("posterous"))
+		$nodeinfo["services"]["outbound"][] = "posterous";
+
+	if (nodeinfo_plugin_enabled("pumpio")) {
+		$nodeinfo["services"]["inbound"][] = "pumpio";
+		$nodeinfo["services"]["outbound"][] = "pumpio";
+	}
+
+	// redmatrix
 
 	if ($smtp)
-		$nodeinfo["services"][] = "smtp";
+		$nodeinfo["services"]["outbound"][] = "smtp";
 
 	if (nodeinfo_plugin_enabled("tumblr"))
-		$nodeinfo["services"][] = "tumblr";
+		$nodeinfo["services"]["outbound"][] = "tumblr";
 
-	if (nodeinfo_plugin_enabled("twitter"))
-		$nodeinfo["services"][] = "twitter";
+	if (nodeinfo_plugin_enabled("twitter") OR nodeinfo_plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "twitter";
 
-	if (nodeinfo_plugin_enabled("wordpress"))
-		$nodeinfo["services"][] = "wppost";
+	if (nodeinfo_plugin_enabled("wppost"))
+		$nodeinfo["services"]["outbound"][] = "wordpress";
 
-	$nodeinfo["openRegistrations"] = ($a->config['register_policy'] != 0);
+	$nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"];
+	$nodeinfo["metadata"]["protocols"]["outbound"][] = "atom1.0";
+	$nodeinfo["metadata"]["protocols"]["inbound"][] = "atom1.0";
+	$nodeinfo["metadata"]["protocols"]["inbound"][] = "rss2.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["metadata"]["services"] = $nodeinfo["services"];
 
-	$nodeinfo["metadata"] = new stdClass();
+	if (nodeinfo_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);
@@ -126,6 +148,29 @@ function nodeinfo_plugin_enabled($plugin) {
 }
 
 function nodeinfo_cron() {
+
+	$a = get_app();
+
+	// If the plugin "statistics_json" is enabled then disable it and actrivate nodeinfo.
+	if (nodeinfo_plugin_enabled("statistics_json")) {
+		set_config("system", "nodeinfo", true);
+
+		$plugin = "statistics_json";
+		$plugins = get_config("system","addon");
+		$plugins_arr = array();
+
+		if($plugins) {
+			$plugins_arr = explode(",",str_replace(" ", "",$plugins));
+
+			$idx = array_search($plugin, $plugins_arr);
+			if ($idx !== false){
+				unset($plugins_arr[$idx]);
+				uninstall_plugin($plugin);
+				set_config("system","addon", implode(", ",$plugins_arr));
+			}
+		}
+	}
+
 	if (!get_config("system", "nodeinfo"))
 		return;
 
@@ -208,10 +253,10 @@ function nodeinfo_cron() {
 	set_config('nodeinfo','local_comments', $local_comments);
 
 	// Now trying to register
-	//$url = "http://the-federation.info/register/".$a->get_hostname();
-        //logger('nodeinfo_cron: registering url: '.$url, LOGGER_DEBUG);
-	//$ret = fetch_url($url);
-        //logger('nodeinfo_cron: registering answer: '.$ret, LOGGER_DEBUG);
+	$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());