X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnodeinfo.php;h=e084b25da3ed9dafac9345d6ee8e9c643da51f8d;hb=7e846ba7acf2cf452f4250d42105ba24d429f67e;hp=f013c9084ff9c813ae18a91d0edf239451f890fd;hpb=7dbd8ed473f982bed64801e9e62d04713d403c8d;p=friendica.git diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php index f013c9084f..e084b25da3 100644 --- a/mod/nodeinfo.php +++ b/mod/nodeinfo.php @@ -1,24 +1,26 @@ array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0", - "href" => $a->get_baseurl()."/nodeinfo/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(); @@ -67,48 +69,48 @@ function nodeinfo_init(&$a){ $nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]); - if (nodeinfo_plugin_enabled("appnet")) + if (plugin_enabled("appnet")) $nodeinfo["services"]["inbound"][] = "appnet"; - if (nodeinfo_plugin_enabled("appnet") OR nodeinfo_plugin_enabled("buffer")) + if (plugin_enabled("appnet") OR plugin_enabled("buffer")) $nodeinfo["services"]["outbound"][] = "appnet"; - if (nodeinfo_plugin_enabled("blogger")) + if (plugin_enabled("blogger")) $nodeinfo["services"]["outbound"][] = "blogger"; - if (nodeinfo_plugin_enabled("dwpost")) + if (plugin_enabled("dwpost")) $nodeinfo["services"]["outbound"][] = "dreamwidth"; - if (nodeinfo_plugin_enabled("fbpost") OR nodeinfo_plugin_enabled("buffer")) + if (plugin_enabled("fbpost") OR plugin_enabled("buffer")) $nodeinfo["services"]["outbound"][] = "facebook"; - if (nodeinfo_plugin_enabled("statusnet")) { + if (plugin_enabled("statusnet")) { $nodeinfo["services"]["inbound"][] = "gnusocial"; $nodeinfo["services"]["outbound"][] = "gnusocial"; } - if (nodeinfo_plugin_enabled("gpluspost") OR nodeinfo_plugin_enabled("buffer")) + if (plugin_enabled("gpluspost") OR plugin_enabled("buffer")) $nodeinfo["services"]["outbound"][] = "google"; - if (nodeinfo_plugin_enabled("ijpost")) + if (plugin_enabled("ijpost")) $nodeinfo["services"]["outbound"][] = "insanejournal"; - if (nodeinfo_plugin_enabled("libertree")) + if (plugin_enabled("libertree")) $nodeinfo["services"]["outbound"][] = "libertree"; - if (nodeinfo_plugin_enabled("buffer")) + if (plugin_enabled("buffer")) $nodeinfo["services"]["outbound"][] = "linkedin"; - if (nodeinfo_plugin_enabled("ljpost")) + if (plugin_enabled("ljpost")) $nodeinfo["services"]["outbound"][] = "livejournal"; - if (nodeinfo_plugin_enabled("buffer")) + if (plugin_enabled("buffer")) $nodeinfo["services"]["outbound"][] = "pinterest"; - if (nodeinfo_plugin_enabled("posterous")) + if (plugin_enabled("posterous")) $nodeinfo["services"]["outbound"][] = "posterous"; - if (nodeinfo_plugin_enabled("pumpio")) { + if (plugin_enabled("pumpio")) { $nodeinfo["services"]["inbound"][] = "pumpio"; $nodeinfo["services"]["outbound"][] = "pumpio"; } @@ -118,13 +120,13 @@ function nodeinfo_init(&$a){ if ($smtp) $nodeinfo["services"]["outbound"][] = "smtp"; - if (nodeinfo_plugin_enabled("tumblr")) + if (plugin_enabled("tumblr")) $nodeinfo["services"]["outbound"][] = "tumblr"; - if (nodeinfo_plugin_enabled("twitter") OR nodeinfo_plugin_enabled("buffer")) + if (plugin_enabled("twitter") OR plugin_enabled("buffer")) $nodeinfo["services"]["outbound"][] = "twitter"; - if (nodeinfo_plugin_enabled("wppost")) + if (plugin_enabled("wppost")) $nodeinfo["services"]["outbound"][] = "wordpress"; $nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"]; @@ -134,7 +136,7 @@ function nodeinfo_init(&$a){ $nodeinfo["metadata"]["services"] = $nodeinfo["services"]; - if (nodeinfo_plugin_enabled("twitter")) + if (plugin_enabled("twitter")) $nodeinfo["metadata"]["services"]["inbound"][] = "twitter"; header('Content-type: application/json; charset=utf-8'); @@ -142,17 +144,14 @@ function nodeinfo_init(&$a){ 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 (nodeinfo_plugin_enabled("statistics_json")) { + if (plugin_enabled("statistics_json")) { set_config("system", "nodeinfo", true); $plugin = "statistics_json"; @@ -186,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; @@ -210,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; } @@ -225,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; @@ -240,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));