diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 083f66287f..a7dfa08dcf 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -74,12 +74,12 @@ class Contact * This will only be assigned to contacts, not to user accounts * @{ */ - const TYPE_UNKNOWN = -1; - const TYPE_PERSON = User::ACCOUNT_TYPE_PERSON; + const TYPE_UNKNOWN = -1; + const TYPE_PERSON = User::ACCOUNT_TYPE_PERSON; const TYPE_ORGANISATION = User::ACCOUNT_TYPE_ORGANISATION; - const TYPE_NEWS = User::ACCOUNT_TYPE_NEWS; - const TYPE_COMMUNITY = User::ACCOUNT_TYPE_COMMUNITY; - const TYPE_RELAY = User::ACCOUNT_TYPE_RELAY; + const TYPE_NEWS = User::ACCOUNT_TYPE_NEWS; + const TYPE_COMMUNITY = User::ACCOUNT_TYPE_COMMUNITY; + const TYPE_RELAY = User::ACCOUNT_TYPE_RELAY; /** * @} */ @@ -335,7 +335,7 @@ class Contact if (!empty($fields)) { foreach (['id', 'next-update', 'network', 'local-data'] as $internal) { if (!in_array($internal, $fields)) { - $fields[] = $internal; + $fields[] = $internal; $removal[] = $internal; } } @@ -353,19 +353,17 @@ class Contact // Then the alias (which could be anything) if (!DBA::isResult($contact)) { // The link could be provided as http although we stored it as https - $ssl_url = str_replace('http://', 'https://', $url); + $ssl_url = str_replace('http://', 'https://', $url); $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; - $contact = DBA::selectFirst('contact', $fields, $condition, $options); + $contact = DBA::selectFirst('contact', $fields, $condition, $options); } if (!DBA::isResult($contact)) { return []; } - $background_update = DI::config()->get('system', 'update_active_contacts') ? $contact['local-data'] : true; - // Update the contact in the background if needed - if ($background_update && !self::isLocal($url) && Protocol::supportsProbe($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) { + if (UpdateContact::isUpdatable($contact['id'])) { try { UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']); } catch (\InvalidArgumentException $e) { @@ -537,6 +535,17 @@ class Contact return DBA::exists('account-user-view', ["`pid` = ? AND `uid` != ? AND `rel` IN (?, ?)", $cid, 0, self::SHARING, self::FRIEND]); } + /** + * Checks if the provided public contact id has got relations with someone on this system + * + * @param integer $cid Public Contact Id + * @return boolean Contact has followers or sharers on this system + */ + public static function hasRelations(int $cid): bool + { + return DBA::exists('account-user-view', ["`pid` = ? AND `uid` != ? AND `rel` IN (?, ?, ?)", $cid, 0, self::FOLLOWER, self::SHARING, self::FRIEND]); + } + /** * Get the basepath for a given contact link * @@ -837,7 +846,7 @@ class Contact } $fields = ['uid', 'username', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey']; - $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false]); + $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false]); if (!DBA::isResult($user)) { return false; } @@ -868,11 +877,11 @@ class Contact 'network' => Protocol::DFRN, 'url' => $url, // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine. - 'nurl' => Strings::normaliseLink($url), - 'uri-id' => ItemURI::getIdByURI($url), - 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3), - 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'], - 'poll' => DI::baseUrl() . '/feed/' . $user['nickname'], + 'nurl' => Strings::normaliseLink($url), + 'uri-id' => ItemURI::getIdByURI($url), + 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3), + 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'], + 'poll' => DI::baseUrl() . '/feed/' . $user['nickname'], ]; $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); @@ -897,14 +906,14 @@ class Contact $fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO); } - $fields['avatar'] = User::getAvatarUrl($user); - $fields['header'] = User::getBannerUrl($user); - $fields['forum'] = in_array($user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN]); - $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; - $fields['unsearchable'] = !$profile['net-publish']; + $fields['avatar'] = User::getAvatarUrl($user); + $fields['header'] = User::getBannerUrl($user); + $fields['forum'] = in_array($user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN]); + $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; + $fields['unsearchable'] = !$profile['net-publish']; $fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP, User::PAGE_FLAGS_COMM_MAN]); - $fields['baseurl'] = DI::baseUrl(); - $fields['gsid'] = GServer::getID($fields['baseurl'], true); + $fields['baseurl'] = DI::baseUrl(); + $fields['gsid'] = GServer::getID($fields['baseurl'], true); $update = false; @@ -1083,7 +1092,7 @@ class Contact public static function markForArchival(array $contact) { if ((!isset($contact['uri-id']) || !isset($contact['url']) || !isset($contact['archive']) || !isset($contact['self']) || !isset($contact['term-date'])) && !empty($contact['id'])) { - $fields = ['id', 'uri-id', 'url', 'archive', 'self', 'term-date']; + $fields = ['id', 'uri-id', 'url', 'archive', 'self', 'term-date']; $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]); if (!DBA::isResult($contact)) { return; @@ -1135,7 +1144,7 @@ class Contact { // Always unarchive the relay contact entry if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) { - $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false, 'unsearchable' => true]; + $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false, 'unsearchable' => true]; $condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]; if (!DBA::exists('contact', array_merge($condition, $fields))) { self::update($fields, $condition); @@ -1149,7 +1158,7 @@ class Contact } if ((!isset($contact['url']) || !isset($contact['uri-id'])) && !empty($contact['id'])) { - $fields = ['id', 'uri-id', 'url', 'batch', 'term-date']; + $fields = ['id', 'uri-id', 'url', 'batch', 'term-date']; $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]); if (!DBA::isResult($contact)) { return; @@ -1205,11 +1214,11 @@ class Contact if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) { $mention_label = DI::l10n()->t('Post to group'); - $mention_url = 'compose/0?body=!' . $contact['addr']; + $mention_url = 'compose/0?body=!' . $contact['addr']; $network_label = DI::l10n()->t('View group'); } else { $mention_label = DI::l10n()->t('Mention'); - $mention_url = 'compose/0?body=@' . $contact['addr']; + $mention_url = 'compose/0?body=@' . $contact['addr']; $network_label = DI::l10n()->t('Network Posts'); } $network_url = 'contact/' . $contact['id'] . '/conversations'; @@ -1318,9 +1327,7 @@ class Contact if (!empty($contact)) { $contact_id = $contact['id']; - $background_update = DI::config()->get('system', 'update_active_contacts') ? $contact['local-data'] : true; - - if ($background_update && !self::isLocal($url) && Protocol::supportsProbe($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) { + if (UpdateContact::isUpdatable($contact['id'])) { try { UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']); } catch (\InvalidArgumentException $e) { @@ -1369,10 +1376,10 @@ class Contact if (DBA::isResult($personal_contact) && !Probe::isProbable($personal_contact['network'])) { DI::logger()->info('Take contact data from personal contact', ['url' => $url, 'update' => $update, 'contact' => $personal_contact]); - $data = $personal_contact; - $data['photo'] = $personal_contact['avatar']; + $data = $personal_contact; + $data['photo'] = $personal_contact['avatar']; $data['account-type'] = $personal_contact['contact-type']; - $data['hide'] = $personal_contact['unsearchable']; + $data['hide'] = $personal_contact['unsearchable']; unset($data['avatar']); unset($data['contact-type']); unset($data['unsearchable']); @@ -1404,17 +1411,17 @@ class Contact if (!$contact_id) { // We only insert the basic data. The rest will be done in "updateFromProbeArray" $fields = [ - 'uid' => $uid, - 'url' => $data['url'], - 'baseurl' => $data['baseurl'] ?? '', - 'nurl' => Strings::normaliseLink($data['url']), - 'network' => $data['network'], - 'created' => DateTimeFormat::utcNow(), - 'rel' => self::SHARING, - 'writable' => 1, - 'blocked' => 0, - 'readonly' => 0, - 'pending' => 0, + 'uid' => $uid, + 'url' => $data['url'], + 'baseurl' => $data['baseurl'] ?? '', + 'nurl' => Strings::normaliseLink($data['url']), + 'network' => $data['network'], + 'created' => DateTimeFormat::utcNow(), + 'rel' => self::SHARING, + 'writable' => 1, + 'blocked' => 0, + 'readonly' => 0, + 'pending' => 0, ]; $condition = ['nurl' => Strings::normaliseLink($data['url']), 'uid' => $uid, 'deleted' => false]; @@ -1627,13 +1634,13 @@ class Contact if (DI::pConfig()->get($uid, 'system', 'infinite_scroll')) { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); - $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); + $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); } else { $o = ''; } $fields = array_merge(Item::DISPLAY_FIELDLIST, ['featured']); - $items = Post::toArray(Post::selectForUser($uid, $fields, $condition, $params)); + $items = Post::toArray(Post::selectForUser($uid, $fields, $condition, $params)); $o .= DI::conversation()->render($items, ConversationContent::MODE_CONTACT_POSTS); @@ -1690,7 +1697,7 @@ class Contact if (DI::pConfig()->get($uid, 'system', 'infinite_scroll')) { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); - $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); + $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); } else { $o = ''; } @@ -1706,7 +1713,7 @@ class Contact $sql2 = "SELECT `thr-parent-id` AS `uri-id`, `created` FROM `post-user-view` WHERE " . array_shift($condition2); $union = array_merge($condition1, $condition2); - $sql = $sql1 . " UNION " . $sql2; + $sql = $sql1 . " UNION " . $sql2; $sql .= " ORDER BY `created` DESC LIMIT ?, ?"; $union = array_merge($union, [$pager->getStart(), $pager->getItemsPerPage()]); @@ -1715,7 +1722,7 @@ class Contact if (empty($last_created) && ($pager->getStart() == 0)) { $fields = ['uri-id', 'thr-parent-id', 'gravity', 'author-id', 'created']; $pinned = Post\Collection::selectToArrayForContact($cid, Post\Collection::FEATURED, $fields); - $items = array_merge($items, $pinned); + $items = array_merge($items, $pinned); } $o .= DI::conversation()->render($items, ConversationContent::MODE_CONTACTS, $update, false, 'pinned_created', $uid); @@ -1906,9 +1913,9 @@ class Contact */ private static function checkAvatarCacheByArray(array $contact, bool $no_update = false): array { - $update = false; + $update = false; $contact_fields = []; - $fields = ['photo', 'thumb', 'micro']; + $fields = ['photo', 'thumb', 'micro']; foreach ($fields as $field) { if (isset($contact[$field])) { $contact_fields[] = $field; @@ -1964,7 +1971,7 @@ class Contact if (!empty($contact['gsid'])) { // Use default banners for certain platforms - $gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $contact['gsid']]); + $gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $contact['gsid']]); $platform = strtolower($gserver['platform'] ?? ''); } else { $platform = ''; @@ -2009,18 +2016,18 @@ class Contact switch ($size) { case Proxy::SIZE_MICRO: $avatar['size'] = 48; - $default = self::DEFAULT_AVATAR_MICRO; + $default = self::DEFAULT_AVATAR_MICRO; break; case Proxy::SIZE_THUMB: $avatar['size'] = 80; - $default = self::DEFAULT_AVATAR_THUMB; + $default = self::DEFAULT_AVATAR_THUMB; break; case Proxy::SIZE_SMALL: default: $avatar['size'] = 300; - $default = self::DEFAULT_AVATAR_PHOTO; + $default = self::DEFAULT_AVATAR_PHOTO; break; } @@ -2029,14 +2036,14 @@ class Contact $type = Contact::TYPE_PERSON; if (!empty($contact['id'])) { - $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['id' => $contact['id']]); - $platform = $account['platform'] ?? ''; + $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['id' => $contact['id']]); + $platform = $account['platform'] ?? ''; $type = $account['contact-type'] ?? Contact::TYPE_PERSON; } if (empty($platform) && !empty($contact['uri-id'])) { - $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['uri-id' => $contact['uri-id']]); - $platform = $account['platform'] ?? ''; + $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['uri-id' => $contact['uri-id']]); + $platform = $account['platform'] ?? ''; $type = $account['contact-type'] ?? Contact::TYPE_PERSON; } @@ -2146,7 +2153,7 @@ class Contact return DI::baseUrl() . $default; } - $avatar['url'] = ''; + $avatar['url'] = ''; $avatar['success'] = false; Hook::callAll('avatar_lookup', $avatar); @@ -2174,7 +2181,7 @@ class Contact if (empty($updated)) { $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]); $updated = $account['updated'] ?? ''; - $guid = $account['guid'] ?? ''; + $guid = $account['guid'] ?? ''; } $guid = urlencode($guid); @@ -2242,7 +2249,7 @@ class Contact if (empty($updated) || empty($guid)) { $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]); $updated = $account['updated'] ?? ''; - $guid = $account['guid'] ?? ''; + $guid = $account['guid'] ?? ''; } $guid = urlencode($guid); @@ -2373,11 +2380,11 @@ class Contact if ($default_avatar && Proxy::isLocalImage($avatar)) { $fields = [ - 'avatar' => $avatar, + 'avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(), - 'photo' => $avatar, - 'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB), - 'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO) + 'photo' => $avatar, + 'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB), + 'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO) ]; DI::logger()->debug('Use default avatar', ['id' => $cid, 'uid' => $uid]); } @@ -2416,11 +2423,11 @@ class Contact $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true); if ($photos) { $fields = [ - 'avatar' => $avatar, - 'photo' => $photos[0], - 'thumb' => $photos[1], - 'micro' => $photos[2], - 'blurhash' => $photos[3], + 'avatar' => $avatar, + 'photo' => $photos[0], + 'thumb' => $photos[1], + 'micro' => $photos[2], + 'blurhash' => $photos[3], 'avatar-date' => DateTimeFormat::utcNow(), ]; $update = true; @@ -2473,7 +2480,7 @@ class Contact { // Update contact data for all users $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)]; - $contacts = DBA::select('contact', ['id', 'uid'], $condition); + $contacts = DBA::select('contact', ['id', 'uid'], $condition); while ($contact = DBA::fetch($contacts)) { DI::logger()->info('Deleting contact', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $url]); self::remove($contact['id']); @@ -2600,7 +2607,7 @@ class Contact public static function removeDuplicates(string $nurl, int $uid) { $condition = ['nurl' => $nurl, 'uid' => $uid, 'self' => false, 'deleted' => false, 'network' => Protocol::FEDERATED]; - $count = DBA::count('contact', $condition); + $count = DBA::count('contact', $condition); if ($count <= 1) { return false; } @@ -2615,7 +2622,7 @@ class Contact DI::logger()->info('Found duplicates', ['count' => $count, 'first' => $first, 'uid' => $uid, 'nurl' => $nurl]); // Find all duplicates - $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self` AND NOT `deleted`", $nurl, $uid, $first]; + $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self` AND NOT `deleted`", $nurl, $uid, $first]; $duplicates = DBA::select('contact', ['id', 'network'], $condition); while ($duplicate = DBA::fetch($duplicates)) { if (!in_array($duplicate['network'], Protocol::FEDERATED)) { @@ -2686,7 +2693,7 @@ class Contact $data = Probe::uri($contact['url'], $network, $contact['uid']); if (in_array($data['network'], Protocol::FEDERATED) && (parse_url($data['url'], PHP_URL_SCHEME) == 'http')) { - $ssl_url = str_replace('http://', 'https://', $contact['url']); + $ssl_url = str_replace('http://', 'https://', $contact['url']); $ssl_data = Probe::uri($ssl_url, $network, $contact['uid']); if (($ssl_data['network'] == $data['network']) && (parse_url($ssl_data['url'], PHP_URL_SCHEME) != 'http')) { $data = $ssl_data; @@ -2883,12 +2890,12 @@ class Contact } if (isset($ret['account-type']) && is_int($ret['account-type'])) { - $ret['forum'] = false; - $ret['prv'] = false; + $ret['forum'] = false; + $ret['prv'] = false; $ret['contact-type'] = $ret['account-type']; if (($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && isset($ret['manually-approve'])) { $ret['forum'] = (bool)!$ret['manually-approve']; - $ret['prv'] = (bool)!$ret['forum']; + $ret['prv'] = (bool)!$ret['forum']; } } @@ -2907,7 +2914,7 @@ class Contact } $update = false; - $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], $ret['baseurl'] ?? $ret['alias'] ?? ''); + $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], $ret['baseurl'] ?? $ret['alias'] ?? ''); // make sure to not overwrite existing values with blank entries except some technical fields $keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl']; @@ -2974,7 +2981,7 @@ class Contact } if (($uid == 0) || in_array($ret['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { - $ret['last-update'] = $updated; + $ret['last-update'] = $updated; $ret['success_update'] = $updated; } @@ -3106,10 +3113,10 @@ class Contact if (!empty($arr['contact']['name'])) { $probed = false; - $ret = $arr['contact']; + $ret = $arr['contact']; } else { $probed = true; - $ret = Probe::uri($url, $network, $uid); + $ret = Probe::uri($url, $network, $uid); // Ensure that the public contact exists if ($ret['network'] != Protocol::PHANTOM) { @@ -3124,7 +3131,7 @@ class Contact // check if we already have a contact $condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url']), 'deleted' => false]; - $contact = DBA::selectFirst('contact', ['id', 'rel', 'url', 'pending', 'hub-verify'], $condition); + $contact = DBA::selectFirst('contact', ['id', 'rel', 'url', 'pending', 'hub-verify'], $condition); $protocol = self::getProtocol($ret['url'], $ret['network']); @@ -3203,7 +3210,7 @@ class Contact 'nick' => $ret['nick'], 'network' => $ret['network'], 'baseurl' => $ret['baseurl'], - 'gsid' => $ret['gsid'] ?? null, + 'gsid' => $ret['gsid'] ?? null, 'contact-type' => $ret['account-type'] ?? self::TYPE_PERSON, 'protocol' => $protocol, 'pubkey' => $ret['pubkey'], @@ -3223,7 +3230,7 @@ class Contact return $result; } - $contact_id = $contact['id']; + $contact_id = $contact['id']; $result['cid'] = $contact_id; if ($contact['contact-type'] == self::TYPE_COMMUNITY) { @@ -3268,7 +3275,7 @@ class Contact return false; } - $fields = ['id', 'url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked', 'baseurl']; + $fields = ['id', 'url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked', 'baseurl']; $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]); if (!DBA::isResult($pub_contact)) { // Should never happen @@ -3280,10 +3287,10 @@ class Contact return false; } - $url = ($datarray['author-link'] ?? '') ?: $pub_contact['url']; - $name = $pub_contact['name']; - $photo = ($pub_contact['avatar'] ?? '') ?: $pub_contact["photo"]; - $nick = $pub_contact['nick']; + $url = ($datarray['author-link'] ?? '') ?: $pub_contact['url']; + $name = $pub_contact['name']; + $photo = ($pub_contact['avatar'] ?? '') ?: $pub_contact["photo"]; + $nick = $pub_contact['nick']; $network = $pub_contact['network']; // Ensure that we don't create a new contact when there already is one @@ -3361,7 +3368,7 @@ class Contact /// @TODO Encapsulate this into a function/method $fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language']; - $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]); + $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]); if (DBA::isResult($user) && !in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) { // create notification if (is_array($contact_record)) { @@ -3395,7 +3402,7 @@ class Contact } $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true]; - $fields = ['pending' => false]; + $fields = ['pending' => false]; if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) { $fields['rel'] = self::FRIEND; } @@ -3500,7 +3507,7 @@ class Contact DBA::update( 'contact', ['bdyear' => substr($nextbd, 0, 4), 'bd' => $nextbd], - ['id' => $contact['id']] + ['id' => $contact['id']] ); } } @@ -3655,9 +3662,9 @@ class Contact */ public static function isGroup(int $contactid): bool { - $fields = ['contact-type']; + $fields = ['contact-type']; $condition = ['id' => $contactid]; - $contact = DBA::selectFirst('contact', $fields, $condition); + $contact = DBA::selectFirst('contact', $fields, $condition); if (!DBA::isResult($contact)) { return false; } @@ -3675,7 +3682,7 @@ class Contact public static function canReceivePrivateMessages(array $contact): bool { $protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM; - $self = $contact['self'] ?? false; + $self = $contact['self'] ?? false; return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self; } @@ -3706,12 +3713,12 @@ class Contact } $condition = [ - 'network' => $networks, - 'server-failed' => false, - 'failed' => false, - 'deleted' => false, - 'unsearchable' => false, - 'uid' => $uid + 'network' => $networks, + 'server-failed' => false, + 'failed' => false, + 'deleted' => false, + 'unsearchable' => false, + 'uid' => $uid ]; if (!$show_blocked) { @@ -3755,10 +3762,10 @@ class Contact */ public static function addByUrls(array $urls): array { - $added = 0; - $updated = 0; + $added = 0; + $updated = 0; $unchanged = 0; - $count = 0; + $count = 0; foreach ($urls as $url) { if (empty($url) || !is_string($url)) { diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 933ca8d74c..90f68b7725 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -39,44 +39,44 @@ use Psr\Http\Message\UriInterface; class GServer { // Directory types - const DT_NONE = 0; - const DT_POCO = 1; + const DT_NONE = 0; + const DT_POCO = 1; const DT_MASTODON = 2; // Methods to detect server types // Non endpoint specific methods - const DETECT_MANUAL = 0; - const DETECT_HEADER = 1; - const DETECT_BODY = 2; - const DETECT_HOST_META = 3; - const DETECT_CONTACTS = 4; - const DETECT_AP_ACTOR = 5; + const DETECT_MANUAL = 0; + const DETECT_HEADER = 1; + const DETECT_BODY = 2; + const DETECT_HOST_META = 3; + const DETECT_CONTACTS = 4; + const DETECT_AP_ACTOR = 5; const DETECT_AP_COLLECTION = 6; const DETECT_UNSPECIFIC = [self::DETECT_MANUAL, self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_HOST_META, self::DETECT_CONTACTS, self::DETECT_AP_ACTOR]; // Implementation specific endpoints // @todo Possibly add Lemmy detection via the endpoint /api/v3/site - const DETECT_FRIENDIKA = 10; - const DETECT_FRIENDICA = 11; - const DETECT_STATUSNET = 12; - const DETECT_GNUSOCIAL = 13; - const DETECT_CONFIG_JSON = 14; // Statusnet, GNU Social, Older Hubzilla/Redmatrix + const DETECT_FRIENDIKA = 10; + const DETECT_FRIENDICA = 11; + const DETECT_STATUSNET = 12; + const DETECT_GNUSOCIAL = 13; + const DETECT_CONFIG_JSON = 14; // Statusnet, GNU Social, Older Hubzilla/Redmatrix const DETECT_SITEINFO_JSON = 15; // Newer Hubzilla - const DETECT_MASTODON_API = 16; - const DETECT_STATUS_PHP = 17; // Nextcloud - const DETECT_V1_CONFIG = 18; - const DETECT_SYSTEM_ACTOR = 20; // Mistpark, Osada, Roadhouse, Zap - const DETECT_THREADS = 21; + const DETECT_MASTODON_API = 16; + const DETECT_STATUS_PHP = 17; // Nextcloud + const DETECT_V1_CONFIG = 18; + const DETECT_SYSTEM_ACTOR = 20; // Mistpark, Osada, Roadhouse, Zap + const DETECT_THREADS = 21; // Standardized endpoints const DETECT_STATISTICS_JSON = 100; - const DETECT_NODEINFO_10 = 101; // Nodeinfo Version 1.0 - const DETECT_NODEINFO_20 = 102; // Nodeinfo Version 2.0 - const DETECT_NODEINFO2_10 = 103; // Nodeinfo2 Version 1.0 - const DETECT_NODEINFO_21 = 104; // Nodeinfo Version 2.1 - const DETECT_NODEINFO_22 = 105; // Nodeinfo Version 2.2 + const DETECT_NODEINFO_10 = 101; // Nodeinfo Version 1.0 + const DETECT_NODEINFO_20 = 102; // Nodeinfo Version 2.0 + const DETECT_NODEINFO2_10 = 103; // Nodeinfo2 Version 1.0 + const DETECT_NODEINFO_21 = 104; // Nodeinfo Version 2.1 + const DETECT_NODEINFO_22 = 105; // Nodeinfo Version 2.2 /** * Check for the existence of a server and adds it in the background if not existant @@ -343,7 +343,7 @@ class GServer $gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($server_url)]); if (DBA::isResult($gserver)) { if ($gserver['created'] <= DBA::NULL_DATETIME) { - $fields = ['created' => DateTimeFormat::utcNow()]; + $fields = ['created' => DateTimeFormat::utcNow()]; $condition = ['nurl' => Strings::normaliseLink($server_url)]; self::update($fields, $condition); } @@ -450,9 +450,11 @@ class GServer $gserver = DBA::selectFirst('gserver', [], ['nurl' => $nurl]); if (DBA::isResult($gserver)) { $next_update = self::getNextUpdateDate(false, $gserver['created'], $gserver['last_contact']); - self::update(['url' => $url, 'failed' => true, 'blocked' => Network::isUrlBlocked($url), 'last_failure' => DateTimeFormat::utcNow(), - 'next_contact' => $next_update, 'network' => Protocol::PHANTOM, 'detection-method' => null], - ['nurl' => $nurl]); + self::update( + ['url' => $url, 'failed' => true, 'blocked' => Network::isUrlBlocked($url), 'last_failure' => DateTimeFormat::utcNow(), + 'next_contact' => $next_update, 'network' => Protocol::PHANTOM, 'detection-method' => null], + ['nurl' => $nurl] + ); DI::logger()->info('Set failed status for existing server', ['url' => $url]); if (self::isDefunct($gserver)) { self::archiveContacts($gserver['id']); @@ -461,8 +463,8 @@ class GServer } self::insert(['url' => $url, 'nurl' => $nurl, - 'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(), - 'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]); + 'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(), + 'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]); DI::logger()->info('Set failed status for new server', ['url' => $url]); } @@ -592,7 +594,7 @@ class GServer if ((parse_url($url, PHP_URL_HOST) == parse_url($valid_url, PHP_URL_HOST)) && (parse_url($url, PHP_URL_PATH) == parse_url($valid_url, PHP_URL_PATH)) && (parse_url($url, PHP_URL_SCHEME) != parse_url($valid_url, PHP_URL_SCHEME))) { - $url = $valid_url; + $url = $valid_url; } $in_webroot = empty(parse_url($url, PHP_URL_PATH)); @@ -627,10 +629,10 @@ class GServer if ($serverdata['network'] == Protocol::PHANTOM) { if ($in_webroot) { // Fetch the landing page, possibly it reveals some data - $accept = 'application/activity+json,application/ld+json,application/json,*/*;q=0.9'; + $accept = 'application/activity+json,application/ld+json,application/json,*/*;q=0.9'; $curlResult = DI::httpClient()->get($url, $accept, [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); if (!$curlResult->isSuccess() && $curlResult->getReturnCode() == '406') { - $curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); + $curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); $html_fetched = true; } else { $html_fetched = false; @@ -639,8 +641,8 @@ class GServer if ($curlResult->isSuccess()) { $json = json_decode($curlResult->getBodyString(), true); if (!empty($json) && is_array($json)) { - $data = self::fetchDataFromSystemActor($json, $serverdata); - $serverdata = $data['server']; + $data = self::fetchDataFromSystemActor($json, $serverdata); + $serverdata = $data['server']; $systemactor = $data['actor']; if (!$html_fetched && !in_array($serverdata['detection-method'], [self::DETECT_SYSTEM_ACTOR, self::DETECT_AP_COLLECTION])) { $curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); @@ -739,7 +741,7 @@ class GServer return false; } - $serverdata['url'] = $url; + $serverdata['url'] = $url; $serverdata['nurl'] = Strings::normaliseLink($url); // We have to prevent an endless loop here. @@ -803,10 +805,11 @@ class GServer $gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => Strings::normaliseLink($url)]); if (!DBA::isResult($gserver)) { $serverdata['created'] = DateTimeFormat::utcNow(); + $ret = self::insert($serverdata); - $id = DBA::lastInsertId(); + $id = DBA::lastInsertId(); } else { - $ret = self::update($serverdata, ['nurl' => $serverdata['nurl']]); + $ret = self::update($serverdata, ['nurl' => $serverdata['nurl']]); $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]); if (DBA::isResult($gserver)) { $id = $gserver['id']; @@ -816,8 +819,8 @@ class GServer // Count the number of known contacts from this server if (!empty($id) && !in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) { $apcontacts = DBA::count('apcontact', ['gsid' => $id]); - $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]); - $max_users = max($apcontacts, $contacts); + $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]); + $max_users = max($apcontacts, $contacts); if ($max_users > $serverdata['registered-users']) { DI::logger()->info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]); self::update(['registered-users' => $max_users], ['id' => $id]); @@ -846,7 +849,7 @@ class GServer if (!empty($systemactor)) { $contact = Contact::getByURL($systemactor, true, ['gsid', 'baseurl', 'id', 'network', 'url', 'name']); - DI::logger()->debug('Fetched system actor', ['url' => $url, 'gsid' => $id, 'contact' => $contact]); + DI::logger()->debug('Fetched system actor', ['url' => $url, 'gsid' => $id, 'contact' => $contact]); } return $ret; @@ -879,9 +882,9 @@ class GServer $data['subscribe'] = (bool)($data['subscribe'] ?? false); if (!$data['subscribe'] || empty($data['scope']) || !in_array(strtolower($data['scope']), ['all', 'tags'])) { - $data['scope'] = ''; + $data['scope'] = ''; $data['subscribe'] = false; - $data['tags'] = []; + $data['tags'] = []; } $gserver = DBA::selectFirst('gserver', ['id', 'url', 'network', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]); @@ -975,13 +978,14 @@ class GServer return $serverdata; } - $valid = false; + $valid = false; $old_serverdata = $serverdata; $serverdata['detection-method'] = self::DETECT_STATISTICS_JSON; if (!empty($data['version'])) { $valid = true; + $serverdata['version'] = $data['version']; // Version numbers on statistics.json are presented with additional info, e.g.: // 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191. @@ -990,11 +994,13 @@ class GServer if (!empty($data['name'])) { $valid = true; + $serverdata['site_name'] = $data['name']; } if (!empty($data['network'])) { $valid = true; + $serverdata['platform'] = strtolower($data['network']); if ($serverdata['platform'] == 'diaspora') { @@ -1010,21 +1016,25 @@ class GServer if (!empty($data['total_users'])) { $valid = true; + $serverdata['registered-users'] = max($data['total_users'], 1); } if (!empty($data['active_users_monthly'])) { $valid = true; + $serverdata['active-month-users'] = max($data['active_users_monthly'], 0); } if (!empty($data['active_users_halfyear'])) { $valid = true; + $serverdata['active-halfyear-users'] = max($data['active_users_halfyear'], 0); } if (!empty($data['local_posts'])) { $valid = true; + $serverdata['local-posts'] = max($data['local_posts'], 0); } @@ -1065,8 +1075,8 @@ class GServer return []; } - $nodeinfo1_url = ''; - $nodeinfo2_url = ''; + $nodeinfo1_url = ''; + $nodeinfo2_url = ''; $detection_method = self::DETECT_MANUAL; foreach ($nodeinfo['links'] as $link) { @@ -1078,13 +1088,13 @@ class GServer if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') { $nodeinfo1_url = Network::addBasePath($link['href'], $httpResult->getUrl()); } elseif (($detection_method < self::DETECT_NODEINFO_20) && ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0')) { - $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl()); + $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl()); $detection_method = self::DETECT_NODEINFO_20; } elseif (($detection_method < self::DETECT_NODEINFO_21) && ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.1')) { - $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl()); + $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl()); $detection_method = self::DETECT_NODEINFO_21; } elseif (($detection_method < self::DETECT_NODEINFO_22) && ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.2')) { - $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl()); + $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl()); $detection_method = self::DETECT_NODEINFO_22; } } @@ -1132,7 +1142,7 @@ class GServer $server = [ 'detection-method' => self::DETECT_NODEINFO_10, - 'register_policy' => Register::CLOSED + 'register_policy' => Register::CLOSED ]; if (!empty($nodeinfo['openRegistrations'])) { @@ -1232,8 +1242,8 @@ class GServer $server = [ 'detection-method' => $detection_method, - 'register_policy' => Register::CLOSED, - 'platform' => 'unknown', + 'register_policy' => Register::CLOSED, + 'platform' => 'unknown', ]; if (!empty($nodeinfo['openRegistrations'])) { @@ -1363,7 +1373,7 @@ class GServer $server = [ 'detection-method' => self::DETECT_NODEINFO2_10, - 'register_policy' => Register::CLOSED + 'register_policy' => Register::CLOSED ]; if (!empty($nodeinfo['openRegistrations'])) { @@ -1471,7 +1481,7 @@ class GServer if (!empty($data['platform'])) { $serverdata['platform'] = strtolower($data['platform']); - $serverdata['version'] = $data['version'] ?? 'N/A'; + $serverdata['version'] = $data['version'] ?? 'N/A'; } if (!empty($data['plugins'])) { @@ -1547,17 +1557,17 @@ class GServer $actor = JsonLD::compact($data, false); if (in_array(JsonLD::fetchElement($actor, '@type'), ActivityPub\Receiver::ACCOUNT_TYPES)) { - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['network'] = Protocol::ACTIVITYPUB; $serverdata['site_name'] = JsonLD::fetchElement($actor, 'as:name', '@value'); - $serverdata['info'] = JsonLD::fetchElement($actor, 'as:summary', '@value'); + $serverdata['info'] = JsonLD::fetchElement($actor, 'as:summary', '@value'); if (self::isNomad($actor)) { - $serverdata['platform'] = self::getNomadName($actor['@id']); - $serverdata['version'] = self::getNomadVersion($actor['@id']); + $serverdata['platform'] = self::getNomadName($actor['@id']); + $serverdata['version'] = self::getNomadVersion($actor['@id']); $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR; } elseif (!empty($actor['as:generator'])) { - $generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value')); - $serverdata['platform'] = strtolower(array_shift($generator)); - $serverdata['version'] = self::getNomadVersion($actor['@id']); + $generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value')); + $serverdata['platform'] = strtolower(array_shift($generator)); + $serverdata['version'] = self::getNomadVersion($actor['@id']); $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR; } else { $serverdata['detection-method'] = self::DETECT_AP_ACTOR; @@ -1565,8 +1575,8 @@ class GServer return ['server' => $serverdata, 'actor' => $actor['@id']]; } elseif ((JsonLD::fetchElement($actor, '@type') == 'as:Collection')) { // By now only Ktistec seems to provide collections this way - $serverdata['platform'] = 'ktistec'; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['platform'] = 'ktistec'; + $serverdata['network'] = Protocol::ACTIVITYPUB; $serverdata['detection-method'] = self::DETECT_AP_COLLECTION; $actors = JsonLD::fetchElementArray($actor, 'as:items'); @@ -1610,7 +1620,7 @@ class GServer */ private static function getNomadName(string $url): string { - $name = 'nomad'; + $name = 'nomad'; $curlResult = DI::httpClient()->get($url . '/manifest', 'application/manifest+json', [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) { if ($curlResult->getReturnCode() == 418) { @@ -1729,7 +1739,7 @@ class GServer private static function validHostMeta(string $url): bool { $xrd_timeout = DI::config()->get('system', 'xrd_timeout'); - $curlResult = DI::httpClient()->get($url . Probe::HOST_META, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); + $curlResult = DI::httpClient()->get($url . Probe::HOST_META, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); if (!$curlResult->isSuccess()) { return false; } @@ -1828,10 +1838,9 @@ class GServer } if (!empty($data['totalResults'])) { - $registeredUsers = $serverdata['registered-users'] ?? 0; - $serverdata['registered-users'] = max($data['totalResults'], $registeredUsers, 1); - $serverdata['directory-type'] = self::DT_POCO; - $serverdata['poco'] = $url . '/poco'; + $serverdata['registered-users'] = max($data['totalResults'], $serverdata['registered-users'] ?? 0, 1); + $serverdata['directory-type'] = self::DT_POCO; + $serverdata['poco'] = $url . '/poco'; } return $serverdata; @@ -1886,8 +1895,8 @@ class GServer if (!empty($data['instance']) && !empty($data['serverVersion'])) { $serverdata['platform'] = 'peertube'; - $serverdata['version'] = $data['serverVersion']; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['version'] = $data['serverVersion']; + $serverdata['network'] = Protocol::ACTIVITYPUB; if (!empty($data['instance']['name'])) { $serverdata['site_name'] = $data['instance']['name']; @@ -1934,7 +1943,7 @@ class GServer if (!empty($data['version'])) { $serverdata['platform'] = 'nextcloud'; - $serverdata['version'] = $data['version']; + $serverdata['version'] = $data['version']; if ($validHostMeta) { $serverdata['network'] = Protocol::ACTIVITYPUB; @@ -2012,8 +2021,9 @@ class GServer if (!empty($data['version'])) { $serverdata['platform'] = 'mastodon'; - $serverdata['version'] = $data['version'] ?? ''; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['version'] = $data['version'] ?? ''; + $serverdata['network'] = Protocol::ACTIVITYPUB; + $valid = true; } @@ -2023,7 +2033,8 @@ class GServer if (!empty($data['title']) && empty($serverdata['platform']) && ($serverdata['network'] == Protocol::PHANTOM)) { $serverdata['platform'] = 'mastodon'; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['network'] = Protocol::ACTIVITYPUB; + $valid = true; } @@ -2037,19 +2048,22 @@ class GServer if (!empty($serverdata['version']) && preg_match('/.*?\(compatible;\s(.*)\s(.*)\)/ism', $serverdata['version'], $matches)) { $serverdata['platform'] = strtolower($matches[1]); - $serverdata['version'] = $matches[2]; + $serverdata['version'] = $matches[2]; + $valid = true; } if (!empty($serverdata['version']) && strstr(strtolower($serverdata['version']), 'pleroma')) { $serverdata['platform'] = 'pleroma'; - $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version'])); + $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version'])); + $valid = true; } if (!empty($serverdata['platform']) && strstr($serverdata['platform'], 'pleroma')) { - $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['platform'])); + $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['platform'])); $serverdata['platform'] = 'pleroma'; + $valid = true; } @@ -2086,14 +2100,14 @@ class GServer if (!empty($data['site']['platform'])) { $serverdata['platform'] = strtolower($data['site']['platform']['PLATFORM_NAME']); - $serverdata['version'] = $data['site']['platform']['STD_VERSION']; - $serverdata['network'] = Protocol::ZOT; + $serverdata['version'] = $data['site']['platform']['STD_VERSION']; + $serverdata['network'] = Protocol::ZOT; } if (!empty($data['site']['hubzilla'])) { $serverdata['platform'] = strtolower($data['site']['hubzilla']['PLATFORM_NAME']); - $serverdata['version'] = $data['site']['hubzilla']['RED_VERSION']; - $serverdata['network'] = Protocol::ZOT; + $serverdata['version'] = $data['site']['hubzilla']['RED_VERSION']; + $serverdata['network'] = Protocol::ZOT; } if (!empty($data['site']['redmatrix'])) { @@ -2107,9 +2121,9 @@ class GServer $serverdata['network'] = Protocol::ZOT; } - $private = false; + $private = false; $inviteonly = false; - $closed = false; + $closed = false; if (!empty($data['site']['closed'])) { $closed = self::toBoolean($data['site']['closed']); @@ -2196,11 +2210,11 @@ class GServer if (!empty($serverdata['version']) && strtolower(substr($serverdata['version'], 0, 7)) == 'pleroma') { $serverdata['platform'] = 'pleroma'; - $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version'])); - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version'])); + $serverdata['network'] = Protocol::ACTIVITYPUB; } else { $serverdata['platform'] = 'statusnet'; - $serverdata['network'] = Protocol::OSTATUS; + $serverdata['network'] = Protocol::OSTATUS; } if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) { @@ -2226,11 +2240,11 @@ class GServer $curlResult = DI::httpClient()->get($url . '/friendica/json', HttpClientAccept::DEFAULT, [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); if (!$curlResult->isSuccess()) { $curlResult = DI::httpClient()->get($url . '/friendika/json', HttpClientAccept::DEFAULT, [HttpClientOptions::REQUEST => HttpClientRequest::SERVERINFO]); - $friendika = true; - $platform = 'Friendika'; + $friendika = true; + $platform = 'Friendika'; } else { $friendika = false; - $platform = 'Friendica'; + $platform = 'Friendica'; } if (!$curlResult->isSuccess()) { @@ -2317,12 +2331,14 @@ class GServer $doc = new DOMDocument(); @$doc->loadHTML($curlResult->getBodyString()); $xpath = new DOMXPath($doc); + $assigned = false; // We can only detect honk via some HTML element on their page if ($xpath->query('//div[@id="honksonpage"]')->count() == 1) { $serverdata['platform'] = 'honk'; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['network'] = Protocol::ACTIVITYPUB; + $assigned = true; } @@ -2358,9 +2374,11 @@ class GServer 'twitter:app:name:googleplay', 'twitter:app:name:iphone', 'twitter:app:name:ipad', 'generator'])) { $platform = str_ireplace(array_keys($platforms), array_values($platforms), $attr['content']); $platform = str_replace('/', ' ', $platform); + $platform_parts = explode(' ', $platform); if ((count($platform_parts) >= 2) && in_array(strtolower($platform_parts[0]), array_values($platforms))) { $platform = $platform_parts[0]; + $serverdata['version'] = $platform_parts[1]; } if (in_array($platform, array_values($grouped_platforms['dfrn_platforms']))) { @@ -2372,6 +2390,7 @@ class GServer } if (in_array($platform, array_values($platforms))) { $serverdata['platform'] = $platform; + $assigned = true; } } @@ -2407,6 +2426,7 @@ class GServer if (in_array($attr['property'], ['og:platform', 'generator'])) { if (in_array($attr['content'], array_keys($platforms))) { $serverdata['platform'] = $platforms[$attr['content']]; + $assigned = true; } @@ -2422,9 +2442,10 @@ class GServer foreach ($list as $node) { foreach ($node->attributes as $attribute) { if (parse_url(trim($attribute->value), PHP_URL_HOST) == 'micro.blog') { - $serverdata['version'] = trim($serverdata['platform'] . ' ' . $serverdata['version']); + $serverdata['version'] = trim($serverdata['platform'] . ' ' . $serverdata['version']); $serverdata['platform'] = 'microblog'; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['network'] = Protocol::ACTIVITYPUB; + $assigned = true; } } @@ -2435,9 +2456,10 @@ class GServer foreach ($list as $node) { foreach ($node->attributes as $attribute) { if (trim($attribute->value) == 'https://micro.blog/micropub') { - $serverdata['version'] = trim($serverdata['platform'] . ' ' . $serverdata['version']); + $serverdata['version'] = trim($serverdata['platform'] . ' ' . $serverdata['version']); $serverdata['platform'] = 'microblog'; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['network'] = Protocol::ACTIVITYPUB; + $assigned = true; } } @@ -2463,15 +2485,15 @@ class GServer { if ($curlResult->getHeader('server') == 'Mastodon') { $serverdata['platform'] = 'mastodon'; - $serverdata['network'] = Protocol::ACTIVITYPUB; + $serverdata['network'] = Protocol::ACTIVITYPUB; } elseif ($curlResult->inHeader('x-diaspora-version')) { $serverdata['platform'] = 'diaspora'; - $serverdata['network'] = Protocol::DIASPORA; - $serverdata['version'] = $curlResult->getHeader('x-diaspora-version')[0] ?? ''; + $serverdata['network'] = Protocol::DIASPORA; + $serverdata['version'] = $curlResult->getHeader('x-diaspora-version')[0] ?? ''; } elseif ($curlResult->inHeader('x-friendica-version')) { $serverdata['platform'] = 'friendica'; - $serverdata['network'] = Protocol::DFRN; - $serverdata['version'] = $curlResult->getHeader('x-friendica-version')[0] ?? ''; + $serverdata['network'] = Protocol::DFRN; + $serverdata['version'] = $curlResult->getHeader('x-friendica-version')[0] ?? ''; } else { return $serverdata; } @@ -2488,10 +2510,6 @@ class GServer */ public static function discover() { - if (!DI::config()->get('system', 'discover_servers')) { - return; - } - // Update the server list self::discoverFederation(); @@ -2501,9 +2519,12 @@ class GServer $last_update = date('c', time() - (60 * 60 * 24 * $requery_days)); - $gservers = DBA::select('gserver', ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'], + $gservers = DBA::select( + 'gserver', + ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'], ["NOT `blocked` AND NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update], - ['order' => ['RAND()']]); + ['order' => ['RAND()']] + ); while ($gserver = DBA::fetch($gservers)) { DI::logger()->info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]); @@ -2541,7 +2562,7 @@ class GServer // Discover federated servers $protocols = ['activitypub', 'diaspora', 'dfrn', 'ostatus']; foreach ($protocols as $protocol) { - $query = '{nodes(protocol:"' . $protocol . '"){host}}'; + $query = '{nodes(protocol:"' . $protocol . '"){host}}'; $curlResult = DI::httpClient()->fetch('https://the-federation.info/graphql?query=' . urlencode($query), HttpClientAccept::JSON, 0, '', HttpClientRequest::SERVERDISCOVER); if (!empty($curlResult)) { $data = json_decode($curlResult, true); @@ -2558,7 +2579,7 @@ class GServer $accesstoken = DI::config()->get('system', 'instances_social_key'); if (!empty($accesstoken)) { - $api = 'https://instances.social/api/1.0/instances/list?count=0'; + $api = 'https://instances.social/api/1.0/instances/list?count=0'; $curlResult = DI::httpClient()->get($api, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken], HttpClientOptions::REQUEST => HttpClientRequest::SERVERDISCOVER]]); if ($curlResult->isSuccess()) { $servers = json_decode($curlResult->getBodyString(), true); diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index c162acce9b..72ea6fa5a4 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -7,7 +7,6 @@ namespace Friendica\Module\Admin; -use Friendica\App; use Friendica\Core\Renderer; use Friendica\Core\Search; use Friendica\Core\System; @@ -20,7 +19,6 @@ use Friendica\Model\User; use Friendica\Module\BaseAdmin; use Friendica\Module\Conversation\Community; use Friendica\Module\Register; -use Friendica\Navigation\SystemMessages; use Friendica\Protocol\Relay; use Friendica\Util\BasePath; use Friendica\Util\EMailer\MailBuilder; @@ -58,80 +56,81 @@ class Site extends BaseAdmin $maximagelength = (!empty($_POST['maximagelength']) ? intval(trim($_POST['maximagelength'])) : -1); $jpegimagequality = (!empty($_POST['jpegimagequality']) ? intval(trim($_POST['jpegimagequality'])) : 100); - $register_policy = (!empty($_POST['register_policy']) ? intval(trim($_POST['register_policy'])) : 0); - $max_registered_users = (!empty($_POST['max_registered_users']) ? intval(trim($_POST['max_registered_users'])) : 0); - $daily_registrations = (!empty($_POST['max_daily_registrations']) ? intval(trim($_POST['max_daily_registrations'])) : 0); - $abandon_days = (!empty($_POST['abandon_days']) ? intval(trim($_POST['abandon_days'])) : 0); + $register_policy = (!empty($_POST['register_policy']) ? intval(trim($_POST['register_policy'])) : 0); + $max_registered_users = (!empty($_POST['max_registered_users']) ? intval(trim($_POST['max_registered_users'])) : 0); + $daily_registrations = (!empty($_POST['max_daily_registrations']) ? intval(trim($_POST['max_daily_registrations'])) : 0); + $abandon_days = (!empty($_POST['abandon_days']) ? intval(trim($_POST['abandon_days'])) : 0); - $register_text = (!empty($_POST['register_text']) ? strip_tags(trim($_POST['register_text'])) : ''); + $register_text = (!empty($_POST['register_text']) ? strip_tags(trim($_POST['register_text'])) : ''); - $allowed_sites = (!empty($_POST['allowed_sites']) ? trim($_POST['allowed_sites']) : ''); - $allowed_email = (!empty($_POST['allowed_email']) ? trim($_POST['allowed_email']) : ''); - $disallowed_email = (!empty($_POST['disallowed_email']) ? trim($_POST['disallowed_email']) : ''); - $forbidden_nicknames = (!empty($_POST['forbidden_nicknames']) ? strtolower(trim($_POST['forbidden_nicknames'])) : ''); - $system_actor_name = (!empty($_POST['system_actor_name']) ? trim($_POST['system_actor_name']) : ''); - $no_oembed_rich_content = !empty($_POST['no_oembed_rich_content']); - $allowed_oembed = (!empty($_POST['allowed_oembed']) ? trim($_POST['allowed_oembed']) : ''); - $block_public = !empty($_POST['block_public']); - $force_publish = !empty($_POST['publish_all']); - $global_directory = (!empty($_POST['directory']) ? trim($_POST['directory']) : ''); - $newuser_private = !empty($_POST['newuser_private']); - $enotify_no_content = !empty($_POST['enotify_no_content']); - $private_addons = !empty($_POST['private_addons']); - $disable_embedded = !empty($_POST['disable_embedded']); + $allowed_sites = (!empty($_POST['allowed_sites']) ? trim($_POST['allowed_sites']) : ''); + $allowed_email = (!empty($_POST['allowed_email']) ? trim($_POST['allowed_email']) : ''); + $disallowed_email = (!empty($_POST['disallowed_email']) ? trim($_POST['disallowed_email']) : ''); + $forbidden_nicknames = (!empty($_POST['forbidden_nicknames']) ? strtolower(trim($_POST['forbidden_nicknames'])) : ''); + $system_actor_name = (!empty($_POST['system_actor_name']) ? trim($_POST['system_actor_name']) : ''); + $no_oembed_rich_content = !empty($_POST['no_oembed_rich_content']); + $allowed_oembed = (!empty($_POST['allowed_oembed']) ? trim($_POST['allowed_oembed']) : ''); + $block_public = !empty($_POST['block_public']); + $force_publish = !empty($_POST['publish_all']); + $global_directory = (!empty($_POST['directory']) ? trim($_POST['directory']) : ''); + $newuser_private = !empty($_POST['newuser_private']); + $enotify_no_content = !empty($_POST['enotify_no_content']); + $private_addons = !empty($_POST['private_addons']); + $disable_embedded = !empty($_POST['disable_embedded']); $allow_users_remote_self = !empty($_POST['allow_users_remote_self']); - $allow_relay_channels = !empty($_POST['allow_relay_channels']); - $adjust_poll_frequency = !empty($_POST['adjust_poll_frequency']); - $min_poll_interval = (!empty($_POST['min_poll_interval']) ? intval(trim($_POST['min_poll_interval'])) : 0); - $explicit_content = !empty($_POST['explicit_content']); - $local_search = !empty($_POST['local_search']); - $blocked_tags = (!empty($_POST['blocked_tags']) ? trim($_POST['blocked_tags']) : ''); - $cache_contact_avatar = !empty($_POST['cache_contact_avatar']); + $allow_relay_channels = !empty($_POST['allow_relay_channels']); + $adjust_poll_frequency = !empty($_POST['adjust_poll_frequency']); + $min_poll_interval = (!empty($_POST['min_poll_interval']) ? intval(trim($_POST['min_poll_interval'])) : 0); + $explicit_content = !empty($_POST['explicit_content']); + $local_search = !empty($_POST['local_search']); + $blocked_tags = (!empty($_POST['blocked_tags']) ? trim($_POST['blocked_tags']) : ''); + $cache_contact_avatar = !empty($_POST['cache_contact_avatar']); - $enable_multi_reg = !empty($_POST['enable_multi_reg']); - $enable_openid = !empty($_POST['enable_openid']); - $enable_regfullname = !empty($_POST['enable_regfullname']); - $register_notification = !empty($_POST['register_notification']); - $community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0); + $enable_multi_reg = !empty($_POST['enable_multi_reg']); + $enable_openid = !empty($_POST['enable_openid']); + $enable_regfullname = !empty($_POST['enable_regfullname']); + $register_notification = !empty($_POST['register_notification']); + $community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0); $max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0); $max_server_posts_community_page = (!empty($_POST['max_server_posts_community_page']) ? intval(trim($_POST['max_server_posts_community_page'])) : 0); - $verifyssl = !empty($_POST['verifyssl']); - $proxyuser = (!empty($_POST['proxyuser']) ? trim($_POST['proxyuser']) : ''); - $proxy = (!empty($_POST['proxy']) ? trim($_POST['proxy']) : ''); - $timeout = (!empty($_POST['timeout']) ? intval(trim($_POST['timeout'])) : 60); - $maxloadavg = (!empty($_POST['maxloadavg']) ? intval(trim($_POST['maxloadavg'])) : 20); - $min_memory = (!empty($_POST['min_memory']) ? intval(trim($_POST['min_memory'])) : 0); - $optimize_tables = (!empty($_POST['optimize_tables']) ? intval(trim($_POST['optimize_tables'])) : false); - $contact_discovery = (!empty($_POST['contact_discovery']) ? intval(trim($_POST['contact_discovery'])) : Contact\Relation::DISCOVERY_NONE); - $update_active_contacts = (!empty($_POST['update_active_contacts']) ? intval(trim($_POST['update_active_contacts'])) : false); - $synchronize_directory = (!empty($_POST['synchronize_directory']) ? intval(trim($_POST['synchronize_directory'])) : false); - $poco_requery_days = (!empty($_POST['poco_requery_days']) ? intval(trim($_POST['poco_requery_days'])) : 7); - $poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : false); - $poco_local_search = !empty($_POST['poco_local_search']); - $nodeinfo = !empty($_POST['nodeinfo']); - $mail_enabled = !empty($_POST['mail_enabled']); - $diaspora_enabled = !empty($_POST['diaspora_enabled']); - $force_ssl = !empty($_POST['force_ssl']); - $show_help = !empty($_POST['show_help']); - $dbclean = !empty($_POST['dbclean']); - $dbclean_expire_days = (!empty($_POST['dbclean_expire_days']) ? intval($_POST['dbclean_expire_days']) : 0); - $dbclean_unclaimed = (!empty($_POST['dbclean_unclaimed']) ? intval($_POST['dbclean_unclaimed']) : 0); - $dbclean_expire_conv = (!empty($_POST['dbclean_expire_conv']) ? intval($_POST['dbclean_expire_conv']) : 0); - $suppress_tags = !empty($_POST['suppress_tags']); - $max_comments = (!empty($_POST['max_comments']) ? intval($_POST['max_comments']) : 0); - $max_display_comments = (!empty($_POST['max_display_comments']) ? intval($_POST['max_display_comments']) : 0); - $itemspage_network = (!empty($_POST['itemspage_network']) ? intval($_POST['itemspage_network']) : 0); + $verifyssl = !empty($_POST['verifyssl']); + $proxyuser = (!empty($_POST['proxyuser']) ? trim($_POST['proxyuser']) : ''); + $proxy = (!empty($_POST['proxy']) ? trim($_POST['proxy']) : ''); + $timeout = (!empty($_POST['timeout']) ? intval(trim($_POST['timeout'])) : 60); + $maxloadavg = (!empty($_POST['maxloadavg']) ? intval(trim($_POST['maxloadavg'])) : 20); + $min_memory = (!empty($_POST['min_memory']) ? intval(trim($_POST['min_memory'])) : 0); + $optimize_tables = (!empty($_POST['optimize_tables']) ? intval(trim($_POST['optimize_tables'])) : false); + $contact_discovery = (!empty($_POST['contact_discovery']) ? intval(trim($_POST['contact_discovery'])) : Contact\Relation::DISCOVERY_NONE); + $update_active_contacts = (!empty($_POST['update_active_contacts']) ? intval(trim($_POST['update_active_contacts'])) : false); + $update_known_contacts = (!empty($_POST['update_known_contacts']) ? intval(trim($_POST['update_known_contacts'])) : false); + $synchronize_directory = (!empty($_POST['synchronize_directory']) ? intval(trim($_POST['synchronize_directory'])) : false); + $poco_requery_days = (!empty($_POST['poco_requery_days']) ? intval(trim($_POST['poco_requery_days'])) : 7); + $poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : false); + $poco_local_search = !empty($_POST['poco_local_search']); + $nodeinfo = !empty($_POST['nodeinfo']); + $mail_enabled = !empty($_POST['mail_enabled']); + $diaspora_enabled = !empty($_POST['diaspora_enabled']); + $force_ssl = !empty($_POST['force_ssl']); + $show_help = !empty($_POST['show_help']); + $dbclean = !empty($_POST['dbclean']); + $dbclean_expire_days = (!empty($_POST['dbclean_expire_days']) ? intval($_POST['dbclean_expire_days']) : 0); + $dbclean_unclaimed = (!empty($_POST['dbclean_unclaimed']) ? intval($_POST['dbclean_unclaimed']) : 0); + $dbclean_expire_conv = (!empty($_POST['dbclean_expire_conv']) ? intval($_POST['dbclean_expire_conv']) : 0); + $suppress_tags = !empty($_POST['suppress_tags']); + $max_comments = (!empty($_POST['max_comments']) ? intval($_POST['max_comments']) : 0); + $max_display_comments = (!empty($_POST['max_display_comments']) ? intval($_POST['max_display_comments']) : 0); + $itemspage_network = (!empty($_POST['itemspage_network']) ? intval($_POST['itemspage_network']) : 0); $itemspage_network_mobile = (!empty($_POST['itemspage_network_mobile']) ? intval($_POST['itemspage_network_mobile']) : 0); - $temppath = (!empty($_POST['temppath']) ? trim($_POST['temppath']) : ''); - $singleuser = (!empty($_POST['singleuser']) ? trim($_POST['singleuser']) : ''); - $only_tag_search = !empty($_POST['only_tag_search']); - $limited_search_scope = !empty($_POST['limited_search_scope']); - $search_age_days = (!empty($_POST['search_age_days']) ? intval($_POST['search_age_days']) : 0); - $compute_circle_counts = !empty($_POST['compute_circle_counts']); - $process_view = !empty($_POST['process_view']); - $archival_days = (!empty($_POST['archival_days']) ? intval($_POST['archival_days']) : 0); - $check_new_version_url = (!empty($_POST['check_new_version_url']) ? trim($_POST['check_new_version_url']) : 'none'); + $temppath = (!empty($_POST['temppath']) ? trim($_POST['temppath']) : ''); + $singleuser = (!empty($_POST['singleuser']) ? trim($_POST['singleuser']) : ''); + $only_tag_search = !empty($_POST['only_tag_search']); + $limited_search_scope = !empty($_POST['limited_search_scope']); + $search_age_days = (!empty($_POST['search_age_days']) ? intval($_POST['search_age_days']) : 0); + $compute_circle_counts = !empty($_POST['compute_circle_counts']); + $process_view = !empty($_POST['process_view']); + $archival_days = (!empty($_POST['archival_days']) ? intval($_POST['archival_days']) : 0); + $check_new_version_url = (!empty($_POST['check_new_version_url']) ? trim($_POST['check_new_version_url']) : 'none'); $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); $worker_load_cooldown = (!empty($_POST['worker_load_cooldown']) ? intval($_POST['worker_load_cooldown']) : 0); @@ -140,7 +139,6 @@ class Site extends BaseAdmin $cron_interval = (!empty($_POST['cron_interval']) ? intval($_POST['cron_interval']) : 1); $worker_defer_limit = (!empty($_POST['worker_defer_limit']) ? intval($_POST['worker_defer_limit']) : 15); $worker_fetch_limit = (!empty($_POST['worker_fetch_limit']) ? intval($_POST['worker_fetch_limit']) : 1); - $relay_directly = !empty($_POST['relay_directly']); $relay_scope = (!empty($_POST['relay_scope']) ? trim($_POST['relay_scope']) : ''); @@ -159,7 +157,7 @@ class Site extends BaseAdmin $max_posts_per_author = (!empty($_POST['max_posts_per_author']) ? intval($_POST['max_posts_per_author']) : 0); $sharer_interaction_days = (!empty($_POST['sharer_interaction_days']) ? intval($_POST['sharer_interaction_days']) : 0); - $active_panel = (!empty($_POST['active_panel']) ? "#" . trim($_POST['active_panel']) : ''); + $active_panel = (!empty($_POST['active_panel']) ? "#" . trim($_POST['active_panel']) : ''); $transactionConfig = DI::config()->beginTransaction(); @@ -173,23 +171,24 @@ class Site extends BaseAdmin $diaspora_enabled = false; } - $transactionConfig->set('system', 'maxloadavg' , $maxloadavg); - $transactionConfig->set('system', 'min_memory' , $min_memory); - $transactionConfig->set('system', 'optimize_tables' , $optimize_tables); - $transactionConfig->set('system', 'contact_discovery' , $contact_discovery); - $transactionConfig->set('system', 'update_active_contacts' , $update_active_contacts); - $transactionConfig->set('system', 'synchronize_directory' , $synchronize_directory); - $transactionConfig->set('system', 'poco_requery_days' , $poco_requery_days); - $transactionConfig->set('system', 'poco_discovery' , $poco_discovery); - $transactionConfig->set('system', 'poco_local_search' , $poco_local_search); - $transactionConfig->set('system', 'nodeinfo' , $nodeinfo); + $transactionConfig->set('system', 'maxloadavg', $maxloadavg); + $transactionConfig->set('system', 'min_memory', $min_memory); + $transactionConfig->set('system', 'optimize_tables', $optimize_tables); + $transactionConfig->set('system', 'contact_discovery', $contact_discovery); + $transactionConfig->set('system', 'update_active_contacts', $update_active_contacts); + $transactionConfig->set('system', 'update_known_contacts', $update_known_contacts); + $transactionConfig->set('system', 'synchronize_directory', $synchronize_directory); + $transactionConfig->set('system', 'poco_requery_days', $poco_requery_days); + $transactionConfig->set('system', 'poco_discovery', $poco_discovery); + $transactionConfig->set('system', 'poco_local_search', $poco_local_search); + $transactionConfig->set('system', 'nodeinfo', $nodeinfo); if (DI::config()->isWritable('config', 'sitename')) { $transactionConfig->set('config', 'sitename', $sitename); } - $transactionConfig->set('config', 'sender_email' , $sender_email); - $transactionConfig->set('system', 'suppress_tags' , $suppress_tags); - $transactionConfig->set('system', 'shortcut_icon' , $shortcut_icon); - $transactionConfig->set('system', 'touch_icon' , $touch_icon); + $transactionConfig->set('config', 'sender_email', $sender_email); + $transactionConfig->set('system', 'suppress_tags', $suppress_tags); + $transactionConfig->set('system', 'shortcut_icon', $shortcut_icon); + $transactionConfig->set('system', 'touch_icon', $touch_icon); if ($banner == "") { $transactionConfig->delete('system', 'banner'); @@ -234,60 +233,60 @@ class Site extends BaseAdmin } else { DI::sysmsg()->addNotice(DI::l10n()->t('%s is no valid input for maximum image size', $maximagesize)); } - $transactionConfig->set('system', 'max_image_length' , $maximagelength); - $transactionConfig->set('system', 'jpeg_quality' , $jpegimagequality); + $transactionConfig->set('system', 'max_image_length', $maximagelength); + $transactionConfig->set('system', 'jpeg_quality', $jpegimagequality); - $transactionConfig->set('config', 'register_policy' , $register_policy); - $transactionConfig->set('config', 'max_registered_users' , $max_registered_users); + $transactionConfig->set('config', 'register_policy', $register_policy); + $transactionConfig->set('config', 'max_registered_users', $max_registered_users); $transactionConfig->set('system', 'max_daily_registrations', $daily_registrations); User::setRegisterMethodByUserCount(); - $transactionConfig->set('system', 'account_abandon_days' , $abandon_days); - $transactionConfig->set('config', 'register_text' , $register_text); - $transactionConfig->set('system', 'allowed_sites' , $allowed_sites); - $transactionConfig->set('system', 'allowed_email' , $allowed_email); - $transactionConfig->set('system', 'disallowed_email' , $disallowed_email); - $transactionConfig->set('system', 'forbidden_nicknames' , $forbidden_nicknames); - $transactionConfig->set('system', 'system_actor_name' , $system_actor_name); - $transactionConfig->set('system', 'no_oembed_rich_content' , $no_oembed_rich_content); - $transactionConfig->set('system', 'allowed_oembed' , $allowed_oembed); - $transactionConfig->set('system', 'block_public' , $block_public); - $transactionConfig->set('system', 'publish_all' , $force_publish); - $transactionConfig->set('system', 'newuser_private' , $newuser_private); - $transactionConfig->set('system', 'enotify_no_content' , $enotify_no_content); - $transactionConfig->set('system', 'disable_embedded' , $disable_embedded); + $transactionConfig->set('system', 'account_abandon_days', $abandon_days); + $transactionConfig->set('config', 'register_text', $register_text); + $transactionConfig->set('system', 'allowed_sites', $allowed_sites); + $transactionConfig->set('system', 'allowed_email', $allowed_email); + $transactionConfig->set('system', 'disallowed_email', $disallowed_email); + $transactionConfig->set('system', 'forbidden_nicknames', $forbidden_nicknames); + $transactionConfig->set('system', 'system_actor_name', $system_actor_name); + $transactionConfig->set('system', 'no_oembed_rich_content', $no_oembed_rich_content); + $transactionConfig->set('system', 'allowed_oembed', $allowed_oembed); + $transactionConfig->set('system', 'block_public', $block_public); + $transactionConfig->set('system', 'publish_all', $force_publish); + $transactionConfig->set('system', 'newuser_private', $newuser_private); + $transactionConfig->set('system', 'enotify_no_content', $enotify_no_content); + $transactionConfig->set('system', 'disable_embedded', $disable_embedded); $transactionConfig->set('system', 'allow_users_remote_self', $allow_users_remote_self); - $transactionConfig->set('system', 'allow_relay_channels' , $allow_relay_channels); - $transactionConfig->set('system', 'adjust_poll_frequency' , $adjust_poll_frequency); - $transactionConfig->set('system', 'min_poll_interval' , $min_poll_interval); - $transactionConfig->set('system', 'explicit_content' , $explicit_content); - $transactionConfig->set('system', 'local_search' , $local_search); - $transactionConfig->set('system', 'blocked_tags' , Strings::cleanTags($blocked_tags)); - $transactionConfig->set('system', 'cache_contact_avatar' , $cache_contact_avatar); - $transactionConfig->set('system', 'check_new_version_url' , $check_new_version_url); + $transactionConfig->set('system', 'allow_relay_channels', $allow_relay_channels); + $transactionConfig->set('system', 'adjust_poll_frequency', $adjust_poll_frequency); + $transactionConfig->set('system', 'min_poll_interval', $min_poll_interval); + $transactionConfig->set('system', 'explicit_content', $explicit_content); + $transactionConfig->set('system', 'local_search', $local_search); + $transactionConfig->set('system', 'blocked_tags', Strings::cleanTags($blocked_tags)); + $transactionConfig->set('system', 'cache_contact_avatar', $cache_contact_avatar); + $transactionConfig->set('system', 'check_new_version_url', $check_new_version_url); $transactionConfig->set('system', 'block_extended_register', !$enable_multi_reg); - $transactionConfig->set('system', 'no_openid' , !$enable_openid); - $transactionConfig->set('system', 'no_regfullname' , !$enable_regfullname); - $transactionConfig->set('system', 'register_notification' , $register_notification); - $transactionConfig->set('system', 'community_page_style' , $community_page_style); + $transactionConfig->set('system', 'no_openid', !$enable_openid); + $transactionConfig->set('system', 'no_regfullname', !$enable_regfullname); + $transactionConfig->set('system', 'register_notification', $register_notification); + $transactionConfig->set('system', 'community_page_style', $community_page_style); $transactionConfig->set('system', 'max_author_posts_community_page', $max_author_posts_community_page); $transactionConfig->set('system', 'max_server_posts_community_page', $max_server_posts_community_page); - $transactionConfig->set('system', 'verifyssl' , $verifyssl); - $transactionConfig->set('system', 'proxyuser' , $proxyuser); - $transactionConfig->set('system', 'proxy' , $proxy); - $transactionConfig->set('system', 'curl_timeout' , $timeout); - $transactionConfig->set('system', 'imap_disabled' , !$mail_enabled && function_exists('imap_open')); - $transactionConfig->set('system', 'diaspora_enabled' , $diaspora_enabled); + $transactionConfig->set('system', 'verifyssl', $verifyssl); + $transactionConfig->set('system', 'proxyuser', $proxyuser); + $transactionConfig->set('system', 'proxy', $proxy); + $transactionConfig->set('system', 'curl_timeout', $timeout); + $transactionConfig->set('system', 'imap_disabled', !$mail_enabled && function_exists('imap_open')); + $transactionConfig->set('system', 'diaspora_enabled', $diaspora_enabled); - $transactionConfig->set('config', 'private_addons' , $private_addons); + $transactionConfig->set('config', 'private_addons', $private_addons); - $transactionConfig->set('system', 'force_ssl' , $force_ssl); - $transactionConfig->set('system', 'hide_help' , !$show_help); + $transactionConfig->set('system', 'force_ssl', $force_ssl); + $transactionConfig->set('system', 'hide_help', !$show_help); - $transactionConfig->set('system', 'dbclean' , $dbclean); - $transactionConfig->set('system', 'dbclean-expire-days' , $dbclean_expire_days); + $transactionConfig->set('system', 'dbclean', $dbclean); + $transactionConfig->set('system', 'dbclean-expire-days', $dbclean_expire_days); $transactionConfig->set('system', 'dbclean_expire_conversation', $dbclean_expire_conv); if ($dbclean_unclaimed == 0) { @@ -314,28 +313,28 @@ class Site extends BaseAdmin $transactionConfig->set('system', 'process_view', $process_view); $transactionConfig->set('system', 'archival_days', $archival_days); - $transactionConfig->set('system', 'worker_queues' , $worker_queues); + $transactionConfig->set('system', 'worker_queues', $worker_queues); $transactionConfig->set('system', 'worker_load_cooldown', $worker_load_cooldown); - $transactionConfig->set('system', 'worker_fastlane' , $worker_fastlane); - $transactionConfig->set('system', 'decoupled_receiver' , $decoupled_receiver); - $transactionConfig->set('system', 'cron_interval' , max($cron_interval, 1)); - $transactionConfig->set('system', 'worker_defer_limit' , $worker_defer_limit); - $transactionConfig->set('system', 'worker_fetch_limit' , max($worker_fetch_limit, 1)); - - $transactionConfig->set('system', 'relay_directly' , $relay_directly); - $transactionConfig->set('system', 'relay_scope' , $relay_scope); - $transactionConfig->set('system', 'relay_server_tags' , Strings::cleanTags($relay_server_tags)); - $transactionConfig->set('system', 'relay_deny_tags' , Strings::cleanTags($relay_deny_tags)); - $transactionConfig->set('system', 'relay_max_tags' , $relay_max_tags); - $transactionConfig->set('system', 'relay_user_tags' , $relay_user_tags); - $transactionConfig->set('system', 'relay_deny_undetected_language', $relay_deny_undetected_language); - $transactionConfig->set('system', 'relay_language_quality' , $relay_language_quality); - $transactionConfig->set('system', 'relay_languages' , max($relay_languages, 1)); + $transactionConfig->set('system', 'worker_fastlane', $worker_fastlane); + $transactionConfig->set('system', 'decoupled_receiver', $decoupled_receiver); + $transactionConfig->set('system', 'cron_interval', max($cron_interval, 1)); + $transactionConfig->set('system', 'worker_defer_limit', $worker_defer_limit); + $transactionConfig->set('system', 'worker_fetch_limit', max($worker_fetch_limit, 1)); - $transactionConfig->set('channel', 'engagement_hours' , $engagement_hours); - $transactionConfig->set('channel', 'engagement_post_limit' , $engagement_post_limit); - $transactionConfig->set('channel', 'interaction_score_days' , $interaction_score_days); - $transactionConfig->set('channel', 'max_posts_per_author' , $max_posts_per_author); + $transactionConfig->set('system', 'relay_directly', $relay_directly); + $transactionConfig->set('system', 'relay_scope', $relay_scope); + $transactionConfig->set('system', 'relay_server_tags', Strings::cleanTags($relay_server_tags)); + $transactionConfig->set('system', 'relay_deny_tags', Strings::cleanTags($relay_deny_tags)); + $transactionConfig->set('system', 'relay_max_tags', $relay_max_tags); + $transactionConfig->set('system', 'relay_user_tags', $relay_user_tags); + $transactionConfig->set('system', 'relay_deny_undetected_language', $relay_deny_undetected_language); + $transactionConfig->set('system', 'relay_language_quality', $relay_language_quality); + $transactionConfig->set('system', 'relay_languages', max($relay_languages, 1)); + + $transactionConfig->set('channel', 'engagement_hours', $engagement_hours); + $transactionConfig->set('channel', 'engagement_post_limit', $engagement_post_limit); + $transactionConfig->set('channel', 'interaction_score_days', $interaction_score_days); + $transactionConfig->set('channel', 'max_posts_per_author', $max_posts_per_author); $transactionConfig->set('channel', 'sharer_interaction_days', $sharer_interaction_days); $transactionConfig->commit(); @@ -357,10 +356,10 @@ class Site extends BaseAdmin } /* Installed themes */ - $theme_choices = []; - $theme_choices_mobile = []; + $theme_choices = []; + $theme_choices_mobile = []; $theme_choices_mobile['---'] = DI::l10n()->t('No special theme for mobile devices'); - $files = glob('view/theme/*'); + $files = glob('view/theme/*'); if (is_array($files)) { $allowed_theme_list = DI::config()->get('system', 'allowed_themes'); @@ -397,7 +396,7 @@ class Site extends BaseAdmin /* get user names to make the install a personal install of X */ // @TODO Move to Model\User::getNames() - $user_names = []; + $user_names = []; $user_names['---'] = DI::l10n()->t('Multi user instance'); $usersStmt = DBA::select('user', ['username', 'nickname'], ['account_removed' => 0, 'account_expired' => 0]); @@ -421,20 +420,20 @@ class Site extends BaseAdmin /* Register policy */ $register_choices = [ - Register::CLOSED => DI::l10n()->t('Closed'), + Register::CLOSED => DI::l10n()->t('Closed'), Register::APPROVE => DI::l10n()->t('Requires approval'), - Register::OPEN => DI::l10n()->t('Open') + Register::OPEN => DI::l10n()->t('Open') ]; $check_git_version_choices = [ - 'none' => DI::l10n()->t('Don\'t check'), - 'stable' => DI::l10n()->t('check the stable version'), + 'none' => DI::l10n()->t('Don\'t check'), + 'stable' => DI::l10n()->t('check the stable version'), 'develop' => DI::l10n()->t('check the development version') ]; $discovery_choices = [ - Contact\Relation::DISCOVERY_NONE => DI::l10n()->t('none'), - Contact\Relation::DISCOVERY_LOCAL => DI::l10n()->t('Local contacts'), + Contact\Relation::DISCOVERY_NONE => DI::l10n()->t('none'), + Contact\Relation::DISCOVERY_LOCAL => DI::l10n()->t('Local contacts'), Contact\Relation::DISCOVERY_INTERACTOR => DI::l10n()->t('Interactors'), // "All" is deactivated until we are sure not to put too much stress on the fediverse with this // ContactRelation::DISCOVERY_ALL => DI::l10n()->t('All'), @@ -467,118 +466,119 @@ class Site extends BaseAdmin '$relocate_cmd' => DI::l10n()->t('(Friendica directory)# bin/console relocate https://newdomain.com'), // name, label, value, help string, extra data... - '$sitename' => ['sitename', DI::l10n()->t('Site name'), DI::config()->get('config', 'sitename'), !DI::config()->isWritable('config', 'sitename') ? DI::l10n()->t('Read-only because it is set by an environment variable') : '', '', !DI::config()->isWritable('config', 'sitename') ? 'disabled' : ''], - '$sender_email' => ['sender_email', DI::l10n()->t('Sender Email'), DI::config()->get('config', 'sender_email'), DI::l10n()->t('The email address your server shall use to send notification emails from.'), '', '', 'email'], + '$sitename' => ['sitename', DI::l10n()->t('Site name'), DI::config()->get('config', 'sitename'), !DI::config()->isWritable('config', 'sitename') ? DI::l10n()->t('Read-only because it is set by an environment variable') : '', '', !DI::config()->isWritable('config', 'sitename') ? 'disabled' : ''], + '$sender_email' => ['sender_email', DI::l10n()->t('Sender Email'), DI::config()->get('config', 'sender_email'), DI::l10n()->t('The email address your server shall use to send notification emails from.'), '', '', 'email'], '$system_actor_name' => ['system_actor_name', DI::l10n()->t('Name of the system actor'), User::getActorName(), DI::l10n()->t("Name of the internal system account that is used to perform ActivityPub requests. This must be an unused username. If set, this can't be changed again.")], - '$banner' => ['banner', DI::l10n()->t('Banner/Logo'), $banner, ''], - '$email_banner' => ['email_banner', DI::l10n()->t('Email Banner/Logo'), $email_banner, ''], - '$shortcut_icon' => ['shortcut_icon', DI::l10n()->t('Shortcut icon'), DI::config()->get('system', 'shortcut_icon'), DI::l10n()->t('Link to an icon that will be used for browsers.')], - '$touch_icon' => ['touch_icon', DI::l10n()->t('Touch icon'), DI::config()->get('system', 'touch_icon'), DI::l10n()->t('Link to an icon that will be used for tablets and mobiles.')], - '$additional_info' => ['additional_info', DI::l10n()->t('Additional Info'), $additional_info, DI::l10n()->t('For public servers: you can add additional information here that will be listed at %s/servers.', Search::getGlobalDirectory())], - '$language' => ['language', DI::l10n()->t('System language'), DI::config()->get('system', 'language'), !DI::config()->isWritable('system', 'language') ? DI::l10n()->t("Read-only because it is set by an environment variable") : '', $lang_choices, !DI::config()->isWritable('system', 'language') ? 'disabled' : ''], - '$theme' => ['theme', DI::l10n()->t('System theme'), DI::config()->get('system', 'theme'), DI::l10n()->t('Default system theme - may be over-ridden by user profiles - Change default theme settings', DI::baseUrl() . '/admin/themes'), $theme_choices], - '$theme_mobile' => ['theme_mobile', DI::l10n()->t('Mobile system theme'), DI::config()->get('system', 'mobile-theme', '---'), DI::l10n()->t('Theme for mobile devices'), $theme_choices_mobile], - '$force_ssl' => ['force_ssl', DI::l10n()->t('Force SSL'), DI::config()->get('system', 'force_ssl'), DI::l10n()->t('Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.')], - '$show_help' => ['show_help', DI::l10n()->t('Show help entry from navigation menu'), !DI::config()->get('system', 'hide_help'), DI::l10n()->t('Displays the menu entry for the Help pages from the navigation menu. It is always accessible by calling /help directly.')], - '$singleuser' => ['singleuser', DI::l10n()->t('Single user instance'), DI::config()->get('system', 'singleuser', '---'), DI::l10n()->t('Make this instance multi-user or single-user for the named user'), $user_names], + '$banner' => ['banner', DI::l10n()->t('Banner/Logo'), $banner, ''], + '$email_banner' => ['email_banner', DI::l10n()->t('Email Banner/Logo'), $email_banner, ''], + '$shortcut_icon' => ['shortcut_icon', DI::l10n()->t('Shortcut icon'), DI::config()->get('system', 'shortcut_icon'), DI::l10n()->t('Link to an icon that will be used for browsers.')], + '$touch_icon' => ['touch_icon', DI::l10n()->t('Touch icon'), DI::config()->get('system', 'touch_icon'), DI::l10n()->t('Link to an icon that will be used for tablets and mobiles.')], + '$additional_info' => ['additional_info', DI::l10n()->t('Additional Info'), $additional_info, DI::l10n()->t('For public servers: you can add additional information here that will be listed at %s/servers.', Search::getGlobalDirectory())], + '$language' => ['language', DI::l10n()->t('System language'), DI::config()->get('system', 'language'), !DI::config()->isWritable('system', 'language') ? DI::l10n()->t("Read-only because it is set by an environment variable") : '', $lang_choices, !DI::config()->isWritable('system', 'language') ? 'disabled' : ''], + '$theme' => ['theme', DI::l10n()->t('System theme'), DI::config()->get('system', 'theme'), DI::l10n()->t('Default system theme - may be over-ridden by user profiles - Change default theme settings', DI::baseUrl() . '/admin/themes'), $theme_choices], + '$theme_mobile' => ['theme_mobile', DI::l10n()->t('Mobile system theme'), DI::config()->get('system', 'mobile-theme', '---'), DI::l10n()->t('Theme for mobile devices'), $theme_choices_mobile], + '$force_ssl' => ['force_ssl', DI::l10n()->t('Force SSL'), DI::config()->get('system', 'force_ssl'), DI::l10n()->t('Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.')], + '$show_help' => ['show_help', DI::l10n()->t('Show help entry from navigation menu'), !DI::config()->get('system', 'hide_help'), DI::l10n()->t('Displays the menu entry for the Help pages from the navigation menu. It is always accessible by calling /help directly.')], + '$singleuser' => ['singleuser', DI::l10n()->t('Single user instance'), DI::config()->get('system', 'singleuser', '---'), DI::l10n()->t('Make this instance multi-user or single-user for the named user'), $user_names], - '$maximagesize' => ['maximagesize', DI::l10n()->t('Maximum image size'), DI::config()->get('system', 'maximagesize'), DI::l10n()->t('Maximum size in bytes of uploaded images. Default is 0, which means no limits. You can put k, m, or g behind the desired value for KiB, MiB, GiB, respectively. + '$maximagesize' => ['maximagesize', DI::l10n()->t('Maximum image size'), DI::config()->get('system', 'maximagesize'), DI::l10n()->t('Maximum size in bytes of uploaded images. Default is 0, which means no limits. You can put k, m, or g behind the desired value for KiB, MiB, GiB, respectively. The value of upload_max_filesize in your PHP.ini needs be set to at least the desired limit. Currently upload_max_filesize is set to %s (%s byte)', Strings::formatBytes(Strings::getBytesFromShorthand(ini_get('upload_max_filesize'))), Strings::getBytesFromShorthand(ini_get('upload_max_filesize'))), - '', 'pattern="\d+(?:\s*[kmg])?"'], + '', 'pattern="\d+(?:\s*[kmg])?"'], '$maximagelength' => ['maximagelength', DI::l10n()->t('Maximum image length'), DI::config()->get('system', 'max_image_length'), DI::l10n()->t('Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.')], '$jpegimagequality' => ['jpegimagequality', DI::l10n()->t('JPEG image quality'), DI::config()->get('system', 'jpeg_quality'), DI::l10n()->t('Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.')], '$maxfilesize' => ['maxfilesize', DI::l10n()->t('Maximum media file size'), DI::config()->get('system', 'maxfilesize'), DI::l10n()->t('Maximum size in bytes of uploaded media files. Default is 0, which means no limits. You can put k, m, or g behind the desired value for KiB, MiB, GiB, respectively. The value of upload_max_filesize in your PHP.ini needs be set to at least the desired limit. Currently upload_max_filesize is set to %s (%s byte)', Strings::formatBytes(Strings::getBytesFromShorthand(ini_get('upload_max_filesize'))), Strings::getBytesFromShorthand(ini_get('upload_max_filesize'))), - '', 'pattern="\d+(?:\s*[kmg])?"'], + '', 'pattern="\d+(?:\s*[kmg])?"'], - '$register_policy' => ['register_policy', DI::l10n()->t('Register policy'), DI::config()->get('config', 'register_policy'), '', $register_choices], - '$max_registered_users' => ['max_registered_users', DI::l10n()->t('Maximum Users'), DI::config()->get('config', 'max_registered_users'), DI::l10n()->t('If defined, the register policy is automatically closed when the given number of users is reached and reopens the registry when the number drops below the limit. It only works when the policy is set to open or close, but not when the policy is set to approval.')], - '$daily_registrations' => ['max_daily_registrations', DI::l10n()->t('Maximum Daily Registrations'), DI::config()->get('system', 'max_daily_registrations'), DI::l10n()->t('If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.')], - '$register_text' => ['register_text', DI::l10n()->t('Register text'), DI::config()->get('config', 'register_text'), DI::l10n()->t('Will be displayed prominently on the registration page. You can use BBCode here.')], - '$forbidden_nicknames' => ['forbidden_nicknames', DI::l10n()->t('Forbidden Nicknames'), DI::config()->get('system', 'forbidden_nicknames'), DI::l10n()->t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')], - '$abandon_days' => ['abandon_days', DI::l10n()->t('Accounts abandoned after x days'), DI::config()->get('system', 'account_abandon_days'), DI::l10n()->t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], - '$allowed_sites' => ['allowed_sites', DI::l10n()->t('Allowed friend domains'), DI::config()->get('system', 'allowed_sites'), DI::l10n()->t('Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains')], - '$allowed_email' => ['allowed_email', DI::l10n()->t('Allowed email domains'), DI::config()->get('system', 'allowed_email'), DI::l10n()->t('Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains')], - '$disallowed_email' => ['disallowed_email', DI::l10n()->t('Disallowed email domains'), DI::config()->get('system', 'disallowed_email'), DI::l10n()->t('Comma separated list of domains which are rejected as email addresses for registrations to this site. Wildcards are accepted.')], - '$no_oembed_rich_content' => ['no_oembed_rich_content', DI::l10n()->t('No OEmbed rich content'), DI::config()->get('system', 'no_oembed_rich_content'), DI::l10n()->t('Don\'t show the rich content (e.g. embedded PDF), except from the domains listed below.')], - '$allowed_oembed' => ['allowed_oembed', DI::l10n()->t('Trusted third-party domains'), DI::config()->get('system', 'allowed_oembed'), DI::l10n()->t('Comma separated list of domains from which content is allowed to be embedded in posts like with OEmbed. All sub-domains of the listed domains are allowed as well.')], - '$block_public' => ['block_public', DI::l10n()->t('Block public'), DI::config()->get('system', 'block_public'), DI::l10n()->t('Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.')], - '$force_publish' => ['publish_all', DI::l10n()->t('Force publish'), DI::config()->get('system', 'publish_all'), DI::l10n()->t('Check to force all profiles on this site to be listed in the site directory.') . '' . DI::l10n()->t('Enabling this may violate privacy laws like the GDPR') . ''], - '$global_directory' => ['directory', DI::l10n()->t('Global directory URL'), DI::config()->get('system', 'directory'), DI::l10n()->t('URL to the global directory. If this is not set, the global directory is completely unavailable to the application.')], - '$newuser_private' => ['newuser_private', DI::l10n()->t('Private posts by default for new users'), DI::config()->get('system', 'newuser_private'), DI::l10n()->t('Set default post permissions for all new members to the default privacy circle rather than public.')], - '$enotify_no_content' => ['enotify_no_content', DI::l10n()->t('Don\'t include post content in email notifications'), DI::config()->get('system', 'enotify_no_content'), DI::l10n()->t('Don\'t include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.')], - '$private_addons' => ['private_addons', DI::l10n()->t('Disallow public access to addons listed in the apps menu.'), DI::config()->get('config', 'private_addons'), DI::l10n()->t('Checking this box will restrict addons listed in the apps menu to members only.')], - '$disable_embedded' => ['disable_embedded', DI::l10n()->t('Don\'t embed private images in posts'), DI::config()->get('system', 'disable_embedded'), DI::l10n()->t('Don\'t replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.')], - '$explicit_content' => ['explicit_content', DI::l10n()->t('Explicit Content'), DI::config()->get('system', 'explicit_content'), DI::l10n()->t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], - '$local_search' => ['local_search', DI::l10n()->t('Only local search'), DI::config()->get('system', 'local_search'), DI::l10n()->t('Blocks search for users who are not logged in to prevent crawlers from blocking your system.')], - '$blocked_tags' => ['blocked_tags', DI::l10n()->t('Blocked tags for trending tags'), DI::config()->get('system', 'blocked_tags'), DI::l10n()->t("Comma separated list of hashtags that shouldn't be displayed in the trending tags.")], - '$cache_contact_avatar' => ['cache_contact_avatar', DI::l10n()->t('Cache contact avatars'), DI::config()->get('system', 'cache_contact_avatar'), DI::l10n()->t('Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance.')], - '$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')], - '$allow_relay_channels' => ['allow_relay_channels', DI::l10n()->t('Allow Users to set up relay channels'), DI::config()->get('system', 'allow_relay_channels'), DI::l10n()->t('If enabled, it is possible to create relay users that are used to reshare content based on user defined channels.')], - '$adjust_poll_frequency' => ['adjust_poll_frequency', DI::l10n()->t('Adjust the feed poll frequency'), DI::config()->get('system', 'adjust_poll_frequency'), DI::l10n()->t('Automatically detect and set the best feed poll frequency.')], - '$min_poll_interval' => ['min_poll_interval', DI::l10n()->t('Minimum poll interval'), DI::config()->get('system', 'min_poll_interval'), DI::l10n()->t('Minimal distance in minutes between two polls for mail and feed contacts. Reasonable values are between 1 and 59.')], - '$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')], - '$enable_openid' => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')], - '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable full name check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Prevents users from registering with a display name with fewer than two parts separated by spaces.')], - '$register_notification' => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')], - '$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices], + '$register_policy' => ['register_policy', DI::l10n()->t('Register policy'), DI::config()->get('config', 'register_policy'), '', $register_choices], + '$max_registered_users' => ['max_registered_users', DI::l10n()->t('Maximum Users'), DI::config()->get('config', 'max_registered_users'), DI::l10n()->t('If defined, the register policy is automatically closed when the given number of users is reached and reopens the registry when the number drops below the limit. It only works when the policy is set to open or close, but not when the policy is set to approval.')], + '$daily_registrations' => ['max_daily_registrations', DI::l10n()->t('Maximum Daily Registrations'), DI::config()->get('system', 'max_daily_registrations'), DI::l10n()->t('If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.')], + '$register_text' => ['register_text', DI::l10n()->t('Register text'), DI::config()->get('config', 'register_text'), DI::l10n()->t('Will be displayed prominently on the registration page. You can use BBCode here.')], + '$forbidden_nicknames' => ['forbidden_nicknames', DI::l10n()->t('Forbidden Nicknames'), DI::config()->get('system', 'forbidden_nicknames'), DI::l10n()->t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')], + '$abandon_days' => ['abandon_days', DI::l10n()->t('Accounts abandoned after x days'), DI::config()->get('system', 'account_abandon_days'), DI::l10n()->t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], + '$allowed_sites' => ['allowed_sites', DI::l10n()->t('Allowed friend domains'), DI::config()->get('system', 'allowed_sites'), DI::l10n()->t('Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains')], + '$allowed_email' => ['allowed_email', DI::l10n()->t('Allowed email domains'), DI::config()->get('system', 'allowed_email'), DI::l10n()->t('Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains')], + '$disallowed_email' => ['disallowed_email', DI::l10n()->t('Disallowed email domains'), DI::config()->get('system', 'disallowed_email'), DI::l10n()->t('Comma separated list of domains which are rejected as email addresses for registrations to this site. Wildcards are accepted.')], + '$no_oembed_rich_content' => ['no_oembed_rich_content', DI::l10n()->t('No OEmbed rich content'), DI::config()->get('system', 'no_oembed_rich_content'), DI::l10n()->t('Don\'t show the rich content (e.g. embedded PDF), except from the domains listed below.')], + '$allowed_oembed' => ['allowed_oembed', DI::l10n()->t('Trusted third-party domains'), DI::config()->get('system', 'allowed_oembed'), DI::l10n()->t('Comma separated list of domains from which content is allowed to be embedded in posts like with OEmbed. All sub-domains of the listed domains are allowed as well.')], + '$block_public' => ['block_public', DI::l10n()->t('Block public'), DI::config()->get('system', 'block_public'), DI::l10n()->t('Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.')], + '$force_publish' => ['publish_all', DI::l10n()->t('Force publish'), DI::config()->get('system', 'publish_all'), DI::l10n()->t('Check to force all profiles on this site to be listed in the site directory.') . '' . DI::l10n()->t('Enabling this may violate privacy laws like the GDPR') . ''], + '$global_directory' => ['directory', DI::l10n()->t('Global directory URL'), DI::config()->get('system', 'directory'), DI::l10n()->t('URL to the global directory. If this is not set, the global directory is completely unavailable to the application.')], + '$newuser_private' => ['newuser_private', DI::l10n()->t('Private posts by default for new users'), DI::config()->get('system', 'newuser_private'), DI::l10n()->t('Set default post permissions for all new members to the default privacy circle rather than public.')], + '$enotify_no_content' => ['enotify_no_content', DI::l10n()->t('Don\'t include post content in email notifications'), DI::config()->get('system', 'enotify_no_content'), DI::l10n()->t('Don\'t include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.')], + '$private_addons' => ['private_addons', DI::l10n()->t('Disallow public access to addons listed in the apps menu.'), DI::config()->get('config', 'private_addons'), DI::l10n()->t('Checking this box will restrict addons listed in the apps menu to members only.')], + '$disable_embedded' => ['disable_embedded', DI::l10n()->t('Don\'t embed private images in posts'), DI::config()->get('system', 'disable_embedded'), DI::l10n()->t('Don\'t replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.')], + '$explicit_content' => ['explicit_content', DI::l10n()->t('Explicit Content'), DI::config()->get('system', 'explicit_content'), DI::l10n()->t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], + '$local_search' => ['local_search', DI::l10n()->t('Only local search'), DI::config()->get('system', 'local_search'), DI::l10n()->t('Blocks search for users who are not logged in to prevent crawlers from blocking your system.')], + '$blocked_tags' => ['blocked_tags', DI::l10n()->t('Blocked tags for trending tags'), DI::config()->get('system', 'blocked_tags'), DI::l10n()->t("Comma separated list of hashtags that shouldn't be displayed in the trending tags.")], + '$cache_contact_avatar' => ['cache_contact_avatar', DI::l10n()->t('Cache contact avatars'), DI::config()->get('system', 'cache_contact_avatar'), DI::l10n()->t('Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance.')], + '$allow_users_remote_self' => ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')], + '$allow_relay_channels' => ['allow_relay_channels', DI::l10n()->t('Allow Users to set up relay channels'), DI::config()->get('system', 'allow_relay_channels'), DI::l10n()->t('If enabled, it is possible to create relay users that are used to reshare content based on user defined channels.')], + '$adjust_poll_frequency' => ['adjust_poll_frequency', DI::l10n()->t('Adjust the feed poll frequency'), DI::config()->get('system', 'adjust_poll_frequency'), DI::l10n()->t('Automatically detect and set the best feed poll frequency.')], + '$min_poll_interval' => ['min_poll_interval', DI::l10n()->t('Minimum poll interval'), DI::config()->get('system', 'min_poll_interval'), DI::l10n()->t('Minimal distance in minutes between two polls for mail and feed contacts. Reasonable values are between 1 and 59.')], + '$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')], + '$enable_openid' => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')], + '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable full name check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Prevents users from registering with a display name with fewer than two parts separated by spaces.')], + '$register_notification' => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')], + '$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices], '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the local community page. This is useful, when a single user floods the local community page.')], '$max_server_posts_community_page' => ['max_server_posts_community_page', DI::l10n()->t('Posts per server on community page'), DI::config()->get('system', 'max_server_posts_community_page'), DI::l10n()->t('The maximum number of posts per server on the global community page. This is useful, when posts from a single server flood the global community page.')], - '$mail_able' => function_exists('imap_open'), - '$mail_enabled' => ['mail_enabled', DI::l10n()->t('Enable Mail support'), !DI::config()->get('system', 'imap_disabled', !function_exists('imap_open')), DI::l10n()->t('Enable built-in mail support to poll IMAP folders and to reply via mail.')], - '$mail_not_able' => DI::l10n()->t('Mail support can\'t be enabled because the PHP IMAP module is not installed.'), - '$diaspora_able' => $diaspora_able, - '$diaspora_not_able' => DI::l10n()->t('Diaspora support can\'t be enabled because Friendica was installed into a sub directory.'), - '$diaspora_enabled' => ['diaspora_enabled', DI::l10n()->t('Enable Diaspora support'), DI::config()->get('system', 'diaspora_enabled', $diaspora_able), DI::l10n()->t('Enable built-in Diaspora network compatibility for communicating with diaspora servers.')], - '$verifyssl' => ['verifyssl', DI::l10n()->t('Verify SSL'), DI::config()->get('system', 'verifyssl'), DI::l10n()->t('If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.')], - '$proxyuser' => ['proxyuser', DI::l10n()->t('Proxy user'), DI::config()->get('system', 'proxyuser'), DI::l10n()->t('User name for the proxy server.')], - '$proxy' => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), DI::l10n()->t('If you want to use a proxy server that Friendica should use to connect to the network, put the URL of the proxy here.')], - '$timeout' => ['timeout', DI::l10n()->t('Network timeout'), DI::config()->get('system', 'curl_timeout'), DI::l10n()->t('Value is in seconds. Set to 0 for unlimited (not recommended).')], - '$maxloadavg' => ['maxloadavg', DI::l10n()->t('Maximum Load Average'), DI::config()->get('system', 'maxloadavg'), DI::l10n()->t('Maximum system load before delivery and poll processes are deferred - default %d.', 20)], - '$min_memory' => ['min_memory', DI::l10n()->t('Minimal Memory'), DI::config()->get('system', 'min_memory'), DI::l10n()->t('Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).')], - '$optimize_tables' => ['optimize_tables', DI::l10n()->t('Periodically optimize tables'), DI::config()->get('system', 'optimize_tables'), DI::l10n()->t('Periodically optimize tables like the cache and the workerqueue')], + '$mail_able' => function_exists('imap_open'), + '$mail_enabled' => ['mail_enabled', DI::l10n()->t('Enable Mail support'), !DI::config()->get('system', 'imap_disabled', !function_exists('imap_open')), DI::l10n()->t('Enable built-in mail support to poll IMAP folders and to reply via mail.')], + '$mail_not_able' => DI::l10n()->t('Mail support can\'t be enabled because the PHP IMAP module is not installed.'), + '$diaspora_able' => $diaspora_able, + '$diaspora_not_able' => DI::l10n()->t('Diaspora support can\'t be enabled because Friendica was installed into a sub directory.'), + '$diaspora_enabled' => ['diaspora_enabled', DI::l10n()->t('Enable Diaspora support'), DI::config()->get('system', 'diaspora_enabled', $diaspora_able), DI::l10n()->t('Enable built-in Diaspora network compatibility for communicating with diaspora servers.')], + '$verifyssl' => ['verifyssl', DI::l10n()->t('Verify SSL'), DI::config()->get('system', 'verifyssl'), DI::l10n()->t('If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.')], + '$proxyuser' => ['proxyuser', DI::l10n()->t('Proxy user'), DI::config()->get('system', 'proxyuser'), DI::l10n()->t('User name for the proxy server.')], + '$proxy' => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), DI::l10n()->t('If you want to use a proxy server that Friendica should use to connect to the network, put the URL of the proxy here.')], + '$timeout' => ['timeout', DI::l10n()->t('Network timeout'), DI::config()->get('system', 'curl_timeout'), DI::l10n()->t('Value is in seconds. Set to 0 for unlimited (not recommended).')], + '$maxloadavg' => ['maxloadavg', DI::l10n()->t('Maximum Load Average'), DI::config()->get('system', 'maxloadavg'), DI::l10n()->t('Maximum system load before delivery and poll processes are deferred - default %d.', 20)], + '$min_memory' => ['min_memory', DI::l10n()->t('Minimal Memory'), DI::config()->get('system', 'min_memory'), DI::l10n()->t('Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).')], + '$optimize_tables' => ['optimize_tables', DI::l10n()->t('Periodically optimize tables'), DI::config()->get('system', 'optimize_tables'), DI::l10n()->t('Periodically optimize tables like the cache and the workerqueue')], - '$contact_discovery' => ['contact_discovery', DI::l10n()->t('Discover followers/followings from contacts'), DI::config()->get('system', 'contact_discovery'), DI::l10n()->t('If enabled, contacts are checked for their followers and following contacts.') . '