X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnodeinfo.php;h=134c690ce1dc949d58a91f971473e5eafcf96d9d;hb=54707dd4c815b6bf9aec5d8cb9231a1646aaa65a;hp=7a690c15e92bd5589d93ada3d8f57fa7fa62cf6b;hpb=59ce6de50c54a088d725db6e72cc25bcd8f6c0ad;p=friendica.git

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 7a690c15e9..134c690ce1 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -6,14 +6,15 @@
 */
 
 use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\System;
 use Friendica\Core\Config;
-
-require_once 'include/plugin.php';
+use Friendica\Util\Network;
+require_once 'include/dba.php';
 
 function nodeinfo_wellknown(App $a) {
-	$nodeinfo = array('links' => array(array('rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
-					'href' => System::baseUrl().'/nodeinfo/1.0')));
+	$nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
+					'href' => System::baseUrl().'/nodeinfo/1.0']]];
 
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
@@ -22,24 +23,24 @@ function nodeinfo_wellknown(App $a) {
 
 function nodeinfo_init(App $a) {
 	if (!Config::get('system', 'nodeinfo')) {
-		http_status_exit(404);
+		System::httpExit(404);
 		killme();
 	}
 
 	if (($a->argc != 2) || ($a->argv[1] != '1.0')) {
-		http_status_exit(404);
+		System::httpExit(404);
 		killme();
 	}
 
 	$smtp = (function_exists('imap_open') && !Config::get('system', 'imap_disabled') && !Config::get('system', 'dfrn_only'));
 
-	$nodeinfo = array();
+	$nodeinfo = [];
 	$nodeinfo['version'] = '1.0';
-	$nodeinfo['software'] = array('name' => 'friendica', 'version' => FRIENDICA_VERSION.'-'.DB_UPDATE_VERSION);
+	$nodeinfo['software'] = ['name' => 'friendica', 'version' => FRIENDICA_VERSION.'-'.DB_UPDATE_VERSION];
 
-	$nodeinfo['protocols'] = array();
-	$nodeinfo['protocols']['inbound'] = array();
-	$nodeinfo['protocols']['outbound'] = array();
+	$nodeinfo['protocols'] = [];
+	$nodeinfo['protocols']['inbound'] = [];
+	$nodeinfo['protocols']['outbound'] = [];
 
 	if (Config::get('system', 'diaspora_enabled')) {
 		$nodeinfo['protocols']['inbound'][] = 'diaspora';
@@ -54,66 +55,66 @@ function nodeinfo_init(App $a) {
 		$nodeinfo['protocols']['outbound'][] = 'gnusocial';
 	}
 
-	$nodeinfo['services'] = array();
-	$nodeinfo['services']['inbound'] = array();
-	$nodeinfo['services']['outbound'] = array();
+	$nodeinfo['services'] = [];
+	$nodeinfo['services']['inbound'] = [];
+	$nodeinfo['services']['outbound'] = [];
 
-	$nodeinfo['usage'] = array();
+	$nodeinfo['usage'] = [];
 
 	$nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
 
-	$nodeinfo['metadata'] = array('nodeName' => $a->config['sitename']);
+	$nodeinfo['metadata'] = ['nodeName' => $a->config['sitename']];
 
 	if (Config::get('system', 'nodeinfo')) {
 
-		$nodeinfo['usage']['users'] = array('total' => (int)Config::get('nodeinfo', 'total_users'),
+		$nodeinfo['usage']['users'] = ['total' => (int)Config::get('nodeinfo', 'total_users'),
 					'activeHalfyear' => (int)Config::get('nodeinfo', 'active_users_halfyear'),
-					'activeMonth' => (int)Config::get('nodeinfo', 'active_users_monthly'));
+					'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('appnet')) {
+		if (Addon::isEnabled('appnet')) {
 			$nodeinfo['services']['inbound'][] = 'appnet';
 		}
-		if (plugin_enabled('appnet') || plugin_enabled('buffer')) {
+		if (Addon::isEnabled('appnet') || Addon::isEnabled('buffer')) {
 			$nodeinfo['services']['outbound'][] = 'appnet';
 		}
-		if (plugin_enabled('blogger')) {
+		if (Addon::isEnabled('blogger')) {
 			$nodeinfo['services']['outbound'][] = 'blogger';
 		}
-		if (plugin_enabled('dwpost')) {
+		if (Addon::isEnabled('dwpost')) {
 			$nodeinfo['services']['outbound'][] = 'dreamwidth';
 		}
-		if (plugin_enabled('fbpost') || plugin_enabled('buffer')) {
+		if (Addon::isEnabled('fbpost') || Addon::isEnabled('buffer')) {
 			$nodeinfo['services']['outbound'][] = 'facebook';
 		}
-		if (plugin_enabled('statusnet')) {
+		if (Addon::isEnabled('statusnet')) {
 			$nodeinfo['services']['inbound'][] = 'gnusocial';
 			$nodeinfo['services']['outbound'][] = 'gnusocial';
 		}
 
-		if (plugin_enabled('gpluspost') || plugin_enabled('buffer')) {
+		if (Addon::isEnabled('gpluspost') || Addon::isEnabled('buffer')) {
 			$nodeinfo['services']['outbound'][] = 'google';
 		}
-		if (plugin_enabled('ijpost')) {
+		if (Addon::isEnabled('ijpost')) {
 			$nodeinfo['services']['outbound'][] = 'insanejournal';
 		}
-		if (plugin_enabled('libertree')) {
+		if (Addon::isEnabled('libertree')) {
 			$nodeinfo['services']['outbound'][] = 'libertree';
 		}
-		if (plugin_enabled('buffer')) {
+		if (Addon::isEnabled('buffer')) {
 			$nodeinfo['services']['outbound'][] = 'linkedin';
 		}
-		if (plugin_enabled('ljpost')) {
+		if (Addon::isEnabled('ljpost')) {
 			$nodeinfo['services']['outbound'][] = 'livejournal';
 		}
-		if (plugin_enabled('buffer')) {
+		if (Addon::isEnabled('buffer')) {
 			$nodeinfo['services']['outbound'][] = 'pinterest';
 		}
-		if (plugin_enabled('posterous')) {
+		if (Addon::isEnabled('posterous')) {
 			$nodeinfo['services']['outbound'][] = 'posterous';
 		}
-		if (plugin_enabled('pumpio')) {
+		if (Addon::isEnabled('pumpio')) {
 			$nodeinfo['services']['inbound'][] = 'pumpio';
 			$nodeinfo['services']['outbound'][] = 'pumpio';
 		}
@@ -121,13 +122,13 @@ function nodeinfo_init(App $a) {
 		if ($smtp) {
 			$nodeinfo['services']['outbound'][] = 'smtp';
 		}
-		if (plugin_enabled('tumblr')) {
+		if (Addon::isEnabled('tumblr')) {
 			$nodeinfo['services']['outbound'][] = 'tumblr';
 		}
-		if (plugin_enabled('twitter') || plugin_enabled('buffer')) {
+		if (Addon::isEnabled('twitter') || Addon::isEnabled('buffer')) {
 			$nodeinfo['services']['outbound'][] = 'twitter';
 		}
-		if (plugin_enabled('wppost')) {
+		if (Addon::isEnabled('wppost')) {
 			$nodeinfo['services']['outbound'][] = 'wordpress';
 		}
 		$nodeinfo['metadata']['protocols'] = $nodeinfo['protocols'];
@@ -137,7 +138,7 @@ function nodeinfo_init(App $a) {
 
 		$nodeinfo['metadata']['services'] = $nodeinfo['services'];
 
-		if (plugin_enabled('twitter')) {
+		if (Addon::isEnabled('twitter')) {
 			$nodeinfo['metadata']['services']['inbound'][] = 'twitter';
 		}
 	}
@@ -153,22 +154,22 @@ function nodeinfo_cron() {
 
 	$a = get_app();
 
-	// If the plugin 'statistics_json' is enabled then disable it and actrivate nodeinfo.
-	if (plugin_enabled('statistics_json')) {
+	// If the addon 'statistics_json' is enabled then disable it and activate nodeinfo.
+	if (Addon::isEnabled('statistics_json')) {
 		Config::set('system', 'nodeinfo', true);
 
-		$plugin = 'statistics_json';
-		$plugins = Config::get('system', 'addon');
-		$plugins_arr = array();
+		$addon = 'statistics_json';
+		$addons = Config::get('system', 'addon');
+		$addons_arr = [];
 
-		if ($plugins) {
-			$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+		if ($addons) {
+			$addons_arr = explode(',',str_replace(' ', '',$addons));
 
-			$idx = array_search($plugin, $plugins_arr);
+			$idx = array_search($addon, $addons_arr);
 			if ($idx !== false) {
-				unset($plugins_arr[$idx]);
-				uninstall_plugin($plugin);
-				Config::set('system', 'addon', implode(', ',$plugins_arr));
+				unset($addons_arr[$idx]);
+				Addon::uninstall($addon);
+				Config::set('system', 'addon', implode(', ',$addons_arr));
 			}
 		}
 	}
@@ -176,17 +177,8 @@ function nodeinfo_cron() {
 	if (!Config::get('system', 'nodeinfo')) {
 		return;
 	}
-	$last = Config::get('nodeinfo', 'last_calucation');
 
-	if ($last) {
-		// Calculate every 24 hours
-		$next = $last + (24 * 60 * 60);
-		if ($next > time()) {
-			logger('calculation intervall not reached');
-			return;
-		}
-	}
-        logger('cron_start');
+	logger('cron_start');
 
 	$users = q("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
 			FROM `user`
@@ -196,60 +188,43 @@ function nodeinfo_cron() {
 				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;
-			$active_users_monthly = 0;
-
-			$halfyear = time() - (180 * 24 * 60 * 60);
-			$month = time() - (30 * 24 * 60 * 60);
-
-			foreach ($users AS $user) {
-				if ((strtotime($user['login_date']) > $halfyear) ||
-					(strtotime($user['last-item']) > $halfyear)) {
-					++$active_users_halfyear;
-				}
-				if ((strtotime($user['login_date']) > $month) ||
-					(strtotime($user['last-item']) > $month)) {
-					++$active_users_monthly;
-				}
-			}
-			Config::set('nodeinfo', 'total_users', $total_users);
-		        logger('total_users: '.$total_users, LOGGER_DEBUG);
+		$total_users = count($users);
+		$active_users_halfyear = 0;
+		$active_users_monthly = 0;
 
-			Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
-			Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);
-	}
+		$halfyear = time() - (180 * 24 * 60 * 60);
+		$month = time() - (30 * 24 * 60 * 60);
 
-	$posts = q("SELECT COUNT(*) AS `local_posts` FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
+		foreach ($users AS $user) {
+			if ((strtotime($user['login_date']) > $halfyear) ||
+				(strtotime($user['last-item']) > $halfyear)) {
+				++$active_users_halfyear;
+			}
+			if ((strtotime($user['login_date']) > $month) ||
+				(strtotime($user['last-item']) > $month)) {
+				++$active_users_monthly;
+			}
+		}
+		Config::set('nodeinfo', 'total_users', $total_users);
+		Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
+		Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);
 
-	if (!is_array($posts)) {
-		$local_posts = -1;
-	} else {
-		$local_posts = $posts[0]['local_posts'];
+		logger('total_users: ' . $total_users . '/' . $active_users_halfyear. '/' . $active_users_monthly, LOGGER_DEBUG);
 	}
-	Config::set('nodeinfo', 'local_posts', $local_posts);
 
-        logger('local_posts: '.$local_posts, LOGGER_DEBUG);
-
-	$posts = q("SELECT COUNT(*) AS `local_comments` FROM `contact`
-			INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND
-				`item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')
-			WHERE `contact`.`self`",
-			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
+	$local_posts = dba::count('thread', ["`wall` AND NOT `deleted` AND `uid` != 0"]);
+	Config::set('nodeinfo', 'local_posts', $local_posts);
+	logger('local_posts: ' . $local_posts, LOGGER_DEBUG);
 
-	if (!is_array($posts)) {
-		$local_comments = -1;
-	} else {
-		$local_comments = $posts[0]['local_comments'];
-	}
+	$local_comments = dba::count('item', ["`origin` AND `id` != `parent` AND NOT `deleted` AND `uid` != 0"]);
 	Config::set('nodeinfo', 'local_comments', $local_comments);
+	logger('local_comments: ' . $local_comments, LOGGER_DEBUG);
 
 	// Now trying to register
 	$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('registering url: '.$url, LOGGER_DEBUG);
+	$ret = Network::fetchUrl($url);
+	logger('registering answer: '.$ret, LOGGER_DEBUG);
 
-        logger('cron_end');
-	Config::set('nodeinfo', 'last_calucation', time());
+	logger('cron_end');
 }