X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnodeinfo.php;h=104fecb755ddc21ea1ad118ffaaeecc84b603700;hb=2178feab30c6bedbf1206b3e1f141a76301ab5fc;hp=b4f0428f9bc42120d7ae1c933c97f9bcce0be476;hpb=c18c598bafa93cf1650f51fb9cbaba3b4ad9cb29;p=friendica.git

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index b4f0428f9b..104fecb755 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -1,22 +1,26 @@
 <?php
-/*
-Documentation: http://nodeinfo.diaspora.software/schema.html
+/**
+ * @file mod/nodeinfo.php
+ * 
+ * Documentation: http://nodeinfo.diaspora.software/schema.html
 */
 
-function nodeinfo_wellknown(&$a) {
+require_once("include/plugin.php");
+
+function nodeinfo_wellknown(App &$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" => App::get_baseurl()."/nodeinfo/1.0")));
 
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
 	exit;
 }
 
-function nodeinfo_init(&$a){
+function nodeinfo_init(App &$a){
 	if (!get_config("system", "nodeinfo")) {
 		http_status_exit(404);
 		killme();
@@ -50,96 +54,122 @@ 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["services"] = array();
+	$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");
 
-	if (nodeinfo_plugin_enabled("appnet") OR nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "appnet";
+	$nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
 
-	if (nodeinfo_plugin_enabled("blogger"))
-		$nodeinfo["services"][] = "blogger";
+	if (plugin_enabled("appnet"))
+		$nodeinfo["services"]["inbound"][] = "appnet";
 
-	//if (get_config("system","diaspora_enabled"))
-	//	$nodeinfo["services"][] = "diaspora";
+	if (plugin_enabled("appnet") OR plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "appnet";
 
-	if (nodeinfo_plugin_enabled("dwpost"))
-		$nodeinfo["services"][] = "dreamwidth";
+	if (plugin_enabled("blogger"))
+		$nodeinfo["services"]["outbound"][] = "blogger";
 
-	if (nodeinfo_plugin_enabled("fbpost") OR nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "facebook";
+	if (plugin_enabled("dwpost"))
+		$nodeinfo["services"]["outbound"][] = "dreamwidth";
 
-	//$nodeinfo["services"][] = "friendica";
+	if (plugin_enabled("fbpost") OR plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "facebook";
 
-	//if (nodeinfo_plugin_enabled("statusnet") OR !get_config("system","ostatus_disabled"))
-	if (nodeinfo_plugin_enabled("statusnet"))
-		$nodeinfo["services"][] = "gnusocial";
+	if (plugin_enabled("statusnet")) {
+		$nodeinfo["services"]["inbound"][] = "gnusocial";
+		$nodeinfo["services"]["outbound"][] = "gnusocial";
+	}
 
-	if (nodeinfo_plugin_enabled("gpluspost") OR nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "google";
+	if (plugin_enabled("gpluspost") OR plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "google";
 
-	if (nodeinfo_plugin_enabled("ijpost"))
-		$nodeinfo["services"][] = "insanejournal";
+	if (plugin_enabled("ijpost"))
+		$nodeinfo["services"]["outbound"][] = "insanejournal";
 
-	if (nodeinfo_plugin_enabled("libertree"))
-		$nodeinfo["services"][] = "libertree";
+	if (plugin_enabled("libertree"))
+		$nodeinfo["services"]["outbound"][] = "libertree";
 
-	if (nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "linkedin";
+	if (plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "linkedin";
 
-	if (nodeinfo_plugin_enabled("ljpost"))
-		$nodeinfo["services"][] = "livejournal";
+	if (plugin_enabled("ljpost"))
+		$nodeinfo["services"]["outbound"][] = "livejournal";
 
-	if (nodeinfo_plugin_enabled("buffer"))
-		$nodeinfo["services"][] = "pinterest";
+	if (plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "pinterest";
 
-	if (nodeinfo_plugin_enabled("posterous"))
-		$nodeinfo["services"][] = "posterous";
+	if (plugin_enabled("posterous"))
+		$nodeinfo["services"]["outbound"][] = "posterous";
 
-	if (nodeinfo_plugin_enabled("pumpio"))
-		$nodeinfo["services"][] = "pumpio";
+	if (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";
+	if (plugin_enabled("tumblr"))
+		$nodeinfo["services"]["outbound"][] = "tumblr";
 
-	if (nodeinfo_plugin_enabled("twitter"))
-		$nodeinfo["services"][] = "twitter";
+	if (plugin_enabled("twitter") OR plugin_enabled("buffer"))
+		$nodeinfo["services"]["outbound"][] = "twitter";
 
-	if (nodeinfo_plugin_enabled("wppost"))
-		$nodeinfo["services"][] = "wordpress";
+	if (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();
-	$nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
+	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;
 }
 
-function nodeinfo_plugin_enabled($plugin) {
-	$r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
-	return((bool)(count($r) > 0));
-}
+
 
 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);
+
+		$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;
 
@@ -155,20 +185,13 @@ function nodeinfo_cron() {
 	}
         logger("cron_start");
 
-	$users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date`
-			FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
-				FROM `item`
-					WHERE `item`.`type` = 'wall'
-						GROUP BY `item`.`uid`) AS `lastitem`
-						RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`, `contact`, `profile`
-                                WHERE
-					`user`.`uid` = `contact`.`uid` AND `profile`.`uid` = `user`.`uid`
-					AND `profile`.`is-default` AND (`profile`.`publish` OR `profile`.`net-publish`)
-					AND `user`.`verified` AND `contact`.`self`
-					AND NOT `user`.`blocked`
-					AND NOT `user`.`account_removed`
-					AND NOT `user`.`account_expired`");
-
+	$users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
+			FROM `user`
+			INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid` AND `profile`.`is-default`
+			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
+			WHERE (`profile`.`publish` OR `profile`.`net-publish`) AND `user`.`verified`
+				AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
+				AND NOT `user`.`account_expired`");
 	if (is_array($users)) {
 			$total_users = count($users);
 			$active_users_halfyear = 0;
@@ -179,11 +202,11 @@ function nodeinfo_cron() {
 
 			foreach ($users AS $user) {
 				if ((strtotime($user['login_date']) > $halfyear) OR
-					(strtotime($user['lastitem_date']) > $halfyear))
+					(strtotime($user['last-item']) > $halfyear))
 					++$active_users_halfyear;
 
 				if ((strtotime($user['login_date']) > $month) OR
-					(strtotime($user['lastitem_date']) > $month))
+					(strtotime($user['last-item']) > $month))
 					++$active_users_monthly;
 
 			}
@@ -194,11 +217,7 @@ function nodeinfo_cron() {
 			set_config('nodeinfo','active_users_monthly', $active_users_monthly);
 	}
 
-	//$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE `wall` AND `uid` != 0 AND `id` = `parent` AND left(body, 6) != '[share'");
-	$posts = q("SELECT COUNT(*) AS `local_posts` FROM `item`
-			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')",
-			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
+	$posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
 
 	if (!is_array($posts))
 		$local_posts = -1;
@@ -209,7 +228,7 @@ function nodeinfo_cron() {
 
         logger("local_posts: ".$local_posts, LOGGER_DEBUG);
 
-	$posts = q("SELECT COUNT(*) AS `local_comments` FROM `item`
+	$posts = qu("SELECT COUNT(*) AS `local_comments` FROM `item`
 			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `contact`.`self` and `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')",
 			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));