*/
use Friendica\App;
-use Friendica\Core\System;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
-
-require_once 'include/plugin.php';
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Util\Network;
+require_once 'include/dba.php';
function nodeinfo_wellknown(App $a) {
$nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
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();
}
$nodeinfo['usage'] = [];
- $nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
+ $nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED;
- $nodeinfo['metadata'] = ['nodeName' => $a->config['sitename']];
+ $nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')];
if (Config::get('system', 'nodeinfo')) {
$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';
}
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'];
$nodeinfo['metadata']['services'] = $nodeinfo['services'];
- if (plugin_enabled('twitter')) {
+ if (Addon::isEnabled('twitter')) {
$nodeinfo['metadata']['services']['inbound'][] = 'twitter';
}
+
+ $nodeinfo['metadata']['explicitContent'] = Config::get('system', 'explicit_content', false) == true;
}
header('Content-type: application/json; charset=utf-8');
$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 = [];
+ $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));
}
}
}
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`
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');
}
projects / friendica.git / blobdiff