From 0de00003c69dbb1671f80cecee9779cd0870ed2e Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 13 Jan 2025 22:38:07 +0000 Subject: [PATCH 01/31] add Backward Compatibility Promise --- doc/Developers-Intro.md | 73 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index c500b27741..e37313c73f 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -156,3 +156,76 @@ If you are interested in improving those clients, please contact the developers * iOS: *currently no client* * SailfishOS: **Friendiy** [src](https://kirgroup.com/projects/fabrixxm/harbour-friendly) - developed by [Fabio](https://kirgroup.com/profile/fabrixxm/profile) * Windows: **Friendica Mobile** for Windows versions [before 8.1](http://windowsphone.com/s?appid=e3257730-c9cf-4935-9620-5261e3505c67) and [Windows 10](https://www.microsoft.com/store/apps/9nblggh0fhmn) - developed by [Gerhard Seeber](http://mozartweg.dyndns.org/friendica/profile/gerhard/profile) + +## Backward compatability + +### Backward Compatibility Promise + +Friendica can be extended by addons. These addons relies on many internal classes and conventions. As developers our work on Friendica should not break things in the addons without giving the addon maintainers a chance to fix their addons. Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. This is called the Backward Compatibility Promise. + +We promise BC inside every major release. If one release breaks BC, this should considered as a bug and will be fix in a bugfix release. + +Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributing/code/bc.html) we promise BC for every class, interface, trait, enum, function, constant, etc., but with the exception of: + +- Classes, interfaces, traits, enums, functions, methods, properties and constants marked as `@internal` or `@private` +- Extending or modifying a `final` class or method in any way +- Calling `private` methods (via Reflection) +- Accessing `private` propertyies (via Reflection) +- Accessing `private` methods (via Reflection) +- Accessing `private` constants (via Reflection) +- New properties on overrided `protected` methods +- Possible name collisions with new methods in an extended class (addon developers should prefix their custom methods in the extending classes in an appropriate way) +- Dropping support for every PHP version that has reached end of life + +Breaking changes will be happen only in a new release but MUST be hard deprecated first. + +### Deprecation and removing features + +As the development goes by Friendica needs to get rid of old code and concepts. This will be done in 3 steps to give addon maintainer a chance to adjust their addons. + +**1. Label deprecation** + +If we as the Friendica maintainers decide to remove some functions, classes, interface, etc. we start this by adding a `@deprecated` PHPDoc note on the code. For instance the class `Friendica\Core\Logger` should be removed, so we add the following note with a possible replacement. + +```php +/** + * Logger functions + * + * @deprecated 2025.02 Use constructor injection or `DI::logger()` instead + */ +class Logger {/* ... */} +``` + +This way addons developers might be notified by their IDE or other tools that the usage of the class is deprecated. In Friendica we can now start to replace all occurences and usage of this class with the alternative. + +The deprecation albel COULD be remain over multiple releases. As long as the deprecated code is used inside Friendica or the offical addon repository, it SHOULD NOT be hard deprecated. + +**2. Hard deprecation** + +If the deprecated code is no longer used inside Friendica or the offical addons it MUST be hard deprecated. The code MUST NOT be deleted. It MUST be stay for at least to the next major release. + +Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error if it is called. For instance with the deprecated class `Friendica\Core\Logger` the call of every method should be trigger an error: + +```php +/** + * Logger functions + * + * @deprecated 2025.02 Use constructor injection or `DI::logger()` instead + */ +class Logger { + public static function info(string $message, array $context = []) + { + trigger_error('Class `' . __CLASS__ . '` is deprecated since 2025.02 and will be removed in the next major release, use constructor injection or `DI::logger()` instead.', E_USER_DEPRECATED); + + self::getInstance()->info($message, $context); + } + + /* ... */ +} +``` + +This way the maintainer or users of addons will be notified that the addon will stop working in the next release. The addon maintainer now has the time until the next release to fix the deprecations. + +**3. Code Removing** + +Once a major release is published we as the Friendica maintainers can remove all code that is hard deprecated. From 34e6d29d1fd1a501bc15873434bf7445feccf1dd Mon Sep 17 00:00:00 2001 From: Artur Weigandt Date: Mon, 13 Jan 2025 23:56:27 +0100 Subject: [PATCH 02/31] Apply suggestions from code review --- doc/Developers-Intro.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index e37313c73f..d44a2c6224 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -170,7 +170,7 @@ Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributin - Classes, interfaces, traits, enums, functions, methods, properties and constants marked as `@internal` or `@private` - Extending or modifying a `final` class or method in any way - Calling `private` methods (via Reflection) -- Accessing `private` propertyies (via Reflection) +- Accessing `private` properties (via Reflection) - Accessing `private` methods (via Reflection) - Accessing `private` constants (via Reflection) - New properties on overrided `protected` methods @@ -196,13 +196,13 @@ If we as the Friendica maintainers decide to remove some functions, classes, int class Logger {/* ... */} ``` -This way addons developers might be notified by their IDE or other tools that the usage of the class is deprecated. In Friendica we can now start to replace all occurences and usage of this class with the alternative. +This way addon developers might be notified by their IDE or other tools that the usage of the class is deprecated. In Friendica we can now start to replace all occurrences and usage of this class with the alternative. -The deprecation albel COULD be remain over multiple releases. As long as the deprecated code is used inside Friendica or the offical addon repository, it SHOULD NOT be hard deprecated. +The deprecation label COULD be remain over multiple releases. As long as the deprecated code is used inside Friendica or the official addon repository, it SHOULD NOT be hard deprecated. **2. Hard deprecation** -If the deprecated code is no longer used inside Friendica or the offical addons it MUST be hard deprecated. The code MUST NOT be deleted. It MUST be stay for at least to the next major release. +If the deprecated code is no longer used inside Friendica or the official addons it MUST be hard deprecated. The code MUST NOT be deleted. It MUST be stay for at least to the next major release. Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error if it is called. For instance with the deprecated class `Friendica\Core\Logger` the call of every method should be trigger an error: From 3801382ffe7c73826b09f3fcb1588961c35a3431 Mon Sep 17 00:00:00 2001 From: Artur Weigandt Date: Tue, 14 Jan 2025 19:52:03 +0100 Subject: [PATCH 03/31] Update doc/Developers-Intro.md --- doc/Developers-Intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index d44a2c6224..e9236f6934 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -163,7 +163,7 @@ If you are interested in improving those clients, please contact the developers Friendica can be extended by addons. These addons relies on many internal classes and conventions. As developers our work on Friendica should not break things in the addons without giving the addon maintainers a chance to fix their addons. Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. This is called the Backward Compatibility Promise. -We promise BC inside every major release. If one release breaks BC, this should considered as a bug and will be fix in a bugfix release. +We promise BC for deprecated code for at least 6 month. After this time the deprecated code will be remove with the next release. If a release breaks BC without deprecation, this SHOULD considered as a bug and BC SHOULD be restored in a bugfix release. Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributing/code/bc.html) we promise BC for every class, interface, trait, enum, function, constant, etc., but with the exception of: From 3dc467e208ceae967e569809adabc09ab0476d93 Mon Sep 17 00:00:00 2001 From: Artur Weigandt Date: Tue, 14 Jan 2025 20:29:20 +0100 Subject: [PATCH 04/31] Increase BC to 6 months --- doc/Developers-Intro.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index e9236f6934..39462d20f7 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -157,14 +157,12 @@ If you are interested in improving those clients, please contact the developers * SailfishOS: **Friendiy** [src](https://kirgroup.com/projects/fabrixxm/harbour-friendly) - developed by [Fabio](https://kirgroup.com/profile/fabrixxm/profile) * Windows: **Friendica Mobile** for Windows versions [before 8.1](http://windowsphone.com/s?appid=e3257730-c9cf-4935-9620-5261e3505c67) and [Windows 10](https://www.microsoft.com/store/apps/9nblggh0fhmn) - developed by [Gerhard Seeber](http://mozartweg.dyndns.org/friendica/profile/gerhard/profile) -## Backward compatability +## Backward compatibility ### Backward Compatibility Promise Friendica can be extended by addons. These addons relies on many internal classes and conventions. As developers our work on Friendica should not break things in the addons without giving the addon maintainers a chance to fix their addons. Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. This is called the Backward Compatibility Promise. -We promise BC for deprecated code for at least 6 month. After this time the deprecated code will be remove with the next release. If a release breaks BC without deprecation, this SHOULD considered as a bug and BC SHOULD be restored in a bugfix release. - Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributing/code/bc.html) we promise BC for every class, interface, trait, enum, function, constant, etc., but with the exception of: - Classes, interfaces, traits, enums, functions, methods, properties and constants marked as `@internal` or `@private` @@ -173,12 +171,10 @@ Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributin - Accessing `private` properties (via Reflection) - Accessing `private` methods (via Reflection) - Accessing `private` constants (via Reflection) -- New properties on overrided `protected` methods +- New properties on overridden `protected` methods - Possible name collisions with new methods in an extended class (addon developers should prefix their custom methods in the extending classes in an appropriate way) - Dropping support for every PHP version that has reached end of life -Breaking changes will be happen only in a new release but MUST be hard deprecated first. - ### Deprecation and removing features As the development goes by Friendica needs to get rid of old code and concepts. This will be done in 3 steps to give addon maintainer a chance to adjust their addons. @@ -196,13 +192,13 @@ If we as the Friendica maintainers decide to remove some functions, classes, int class Logger {/* ... */} ``` -This way addon developers might be notified by their IDE or other tools that the usage of the class is deprecated. In Friendica we can now start to replace all occurrences and usage of this class with the alternative. +This way addon developers might be notified early by their IDE or other tools that the usage of the class is deprecated. In Friendica we can now start to replace all occurrences and usage of this class with the alternative. -The deprecation label COULD be remain over multiple releases. As long as the deprecated code is used inside Friendica or the official addon repository, it SHOULD NOT be hard deprecated. +The deprecation label COULD be remain over multiple releases. As long as the `@deprecated` labeled code is used inside Friendica or the official addon repository, it SHOULD NOT be hard deprecated. **2. Hard deprecation** -If the deprecated code is no longer used inside Friendica or the official addons it MUST be hard deprecated. The code MUST NOT be deleted. It MUST be stay for at least to the next major release. +If the deprecated code is no longer used inside Friendica or the official addons it MUST be hard deprecated. The code MUST NOT be deleted. Starting from the next release, it MUST be stay for at least 6 months. Hard deprecated code COULD remain longer than 6 months, depending on when a release appears. Addon developer MUST NOT consider that they have more than 6 months to adjust their code. Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error if it is called. For instance with the deprecated class `Friendica\Core\Logger` the call of every method should be trigger an error: @@ -215,17 +211,23 @@ Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error class Logger { public static function info(string $message, array $context = []) { - trigger_error('Class `' . __CLASS__ . '` is deprecated since 2025.02 and will be removed in the next major release, use constructor injection or `DI::logger()` instead.', E_USER_DEPRECATED); + trigger_error('Class `' . __CLASS__ . '` is deprecated since 2025.05 and will be removed after 6 months, use constructor injection or `DI::logger()` instead.', E_USER_DEPRECATED); self::getInstance()->info($message, $context); } - /* ... */ + /* ... */ } ``` -This way the maintainer or users of addons will be notified that the addon will stop working in the next release. The addon maintainer now has the time until the next release to fix the deprecations. +This way the maintainer or users of addons will be notified that the addon will stop working in one of the next releases. The addon maintainer now has at least 6 months to fix the deprecations. + +Please note that the deprecation message contains the release that will be released next. In the example the code was hard deprecated in `2025.05` and COULD be removed earliest with the `2025.11` release. **3. Code Removing** -Once a major release is published we as the Friendica maintainers can remove all code that is hard deprecated. +We promise BC for deprecated code for at least 6 month, starting from the release the deprecation was announced. After this time the deprecated code COULD be remove within the next release. + +Breaking changes MUST be happen only in a new release but MUST be hard deprecated first. The BC promise refers only to releases, respective the `stable` branch. Deprecated code on other branches like `develop` or RC branches could be removed earlier. This is not a BC break as long as the release is published 6 months after the deprecation. + +If a release breaks BC without deprecation or earlier than 6 months, this SHOULD considered as a bug and BC SHOULD be restored in a bugfix release. From 11593bb88732f0dc97acc89c0e1d1bba6aa172f4 Mon Sep 17 00:00:00 2001 From: Artur Weigandt Date: Thu, 16 Jan 2025 16:07:32 +0100 Subject: [PATCH 05/31] Adjust fromat --- doc/Developers-Intro.md | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index 39462d20f7..f07b711648 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -161,7 +161,11 @@ If you are interested in improving those clients, please contact the developers ### Backward Compatibility Promise -Friendica can be extended by addons. These addons relies on many internal classes and conventions. As developers our work on Friendica should not break things in the addons without giving the addon maintainers a chance to fix their addons. Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. This is called the Backward Compatibility Promise. +Friendica can be extended by addons. +These addons relies on many classes and conventions from Friendica. +As developers our work on Friendica should not break things in the addons without giving the addon maintainers a chance to fix their addons. +Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. +This is called the Backward Compatibility Promise. Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributing/code/bc.html) we promise BC for every class, interface, trait, enum, function, constant, etc., but with the exception of: @@ -177,11 +181,13 @@ Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributin ### Deprecation and removing features -As the development goes by Friendica needs to get rid of old code and concepts. This will be done in 3 steps to give addon maintainer a chance to adjust their addons. +As the development goes by Friendica needs to get rid of old code and concepts. +This will be done in 3 steps to give addon maintainers a chance to adjust their addons. **1. Label deprecation** -If we as the Friendica maintainers decide to remove some functions, classes, interface, etc. we start this by adding a `@deprecated` PHPDoc note on the code. For instance the class `Friendica\Core\Logger` should be removed, so we add the following note with a possible replacement. +If we as the Friendica maintainers decide to remove some functions, classes, interface, etc. we start this by adding a `@deprecated` PHPDoc note on the code. +For instance the class `Friendica\Core\Logger` should be removed, so we add the following note with a possible replacement: ```php /** @@ -192,15 +198,22 @@ If we as the Friendica maintainers decide to remove some functions, classes, int class Logger {/* ... */} ``` -This way addon developers might be notified early by their IDE or other tools that the usage of the class is deprecated. In Friendica we can now start to replace all occurrences and usage of this class with the alternative. +This way addon developers might be notified early by their IDE or other tools that the usage of the class is deprecated. +In Friendica we can now start to replace all occurrences and usage of this class with the alternative. -The deprecation label COULD be remain over multiple releases. As long as the `@deprecated` labeled code is used inside Friendica or the official addon repository, it SHOULD NOT be hard deprecated. +The deprecation label COULD be remain over multiple releases. +As long as the code that is labeled with `@deprecated` is used inside Friendica or the official addon repository, it SHOULD NOT be hard deprecated. **2. Hard deprecation** -If the deprecated code is no longer used inside Friendica or the official addons it MUST be hard deprecated. The code MUST NOT be deleted. Starting from the next release, it MUST be stay for at least 6 months. Hard deprecated code COULD remain longer than 6 months, depending on when a release appears. Addon developer MUST NOT consider that they have more than 6 months to adjust their code. +If the deprecated code is no longer used inside Friendica or the official addons it MUST be hard deprecated. +The code MUST NOT be deleted. +Starting from the next release, it MUST be stay for at least 6 months. +Hard deprecated code COULD remain longer than 6 months, depending on when a release appears. +Addon developer MUST NOT consider that they have more than 6 months to adjust their code. -Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error if it is called. For instance with the deprecated class `Friendica\Core\Logger` the call of every method should be trigger an error: +Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error if it is called. +For instance with the deprecated class `Friendica\Core\Logger` the call of every method should be trigger an error: ```php /** @@ -220,14 +233,20 @@ class Logger { } ``` -This way the maintainer or users of addons will be notified that the addon will stop working in one of the next releases. The addon maintainer now has at least 6 months to fix the deprecations. +This way the maintainer or users of addons will be notified that the addon will stop working in one of the next releases. +The addon maintainer now has at least 6 months to fix the deprecations. -Please note that the deprecation message contains the release that will be released next. In the example the code was hard deprecated in `2025.05` and COULD be removed earliest with the `2025.11` release. +Please note that the deprecation message contains the release that will be released next. +In the example the code was hard deprecated in `2025.05` and COULD be removed earliest with the `2025.11` release. **3. Code Removing** -We promise BC for deprecated code for at least 6 month, starting from the release the deprecation was announced. After this time the deprecated code COULD be remove within the next release. +We promise BC for deprecated code for at least 6 months, starting from the release the deprecation was announced. +After this time the deprecated code COULD be remove within the next release. -Breaking changes MUST be happen only in a new release but MUST be hard deprecated first. The BC promise refers only to releases, respective the `stable` branch. Deprecated code on other branches like `develop` or RC branches could be removed earlier. This is not a BC break as long as the release is published 6 months after the deprecation. +Breaking changes MUST be happen only in a new release but MUST be hard deprecated first. +The BC promise refers only to releases, respective the `stable` branch. +Deprecated code on other branches like `develop` or RC branches could be removed earlier. +This is not a BC break as long as the release is published 6 months after the deprecation. If a release breaks BC without deprecation or earlier than 6 months, this SHOULD considered as a bug and BC SHOULD be restored in a bugfix release. From c6a9e7aa4cea6faeb734a2376b12902a431cb1a4 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 15 Jan 2025 07:42:47 +0000 Subject: [PATCH 06/31] New option to only update contacts with local relations --- src/Model/Contact.php | 19 +- src/Model/GServer.php | 4 - src/Module/Admin/Site.php | 3 + src/Worker/UpdateContact.php | 36 ++ static/settings.config.php | 4 + view/lang/C/messages.po | 708 ++++++++++++----------- view/templates/admin/site.tpl | 1 + view/theme/frio/templates/admin/site.tpl | 1 + 8 files changed, 416 insertions(+), 360 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 083f66287f..7cac007a64 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -362,10 +362,8 @@ class 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 * @@ -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) { diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 933ca8d74c..ee9661b796 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -2488,10 +2488,6 @@ class GServer */ public static function discover() { - if (!DI::config()->get('system', 'discover_servers')) { - return; - } - // Update the server list self::discoverFederation(); diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index c162acce9b..e56e45f0a5 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -105,6 +105,7 @@ class Site extends BaseAdmin $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); @@ -178,6 +179,7 @@ class Site extends BaseAdmin $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); @@ -546,6 +548,7 @@ class Site extends BaseAdmin '
  • ' . DI::l10n()->t('Interactors - contacts of our local contacts and contacts who interacted on locally visible postings are discovered for their followers/followings.') . '
    • ', $discovery_choices], '$update_active_contacts' => ['update_active_contacts', DI::l10n()->t('Only update contacts/servers with local data'), DI::config()->get('system', 'update_active_contacts'), DI::l10n()->t('If enabled, the system will only look for changes in contacts and servers that engaged on this system by either being in a contact list of a user or when posts or comments exists from the contact on this system.')], + '$update_known_contacts' => ['update_known_contacts', DI::l10n()->t('Only update contacts with relations'), DI::config()->get('system', 'update_known_contacts'), DI::l10n()->t('If enabled, the system will only look for changes in contacts that are in a contact list of a user on this system.')], '$synchronize_directory' => ['synchronize_directory', DI::l10n()->t('Synchronize the contacts with the directory server'), DI::config()->get('system', 'synchronize_directory'), DI::l10n()->t('if enabled, the system will check periodically for new contacts on the defined directory server.')], '$poco_discovery' => ['poco_discovery', DI::l10n()->t('Discover contacts from other servers'), DI::config()->get('system', 'poco_discovery'), DI::l10n()->t('Periodically query other servers for contacts and servers that they know of. The system queries Friendica, Mastodon and Hubzilla servers. Keep it deactivated on small machines to decrease the database size and load.')], diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php index 88f157ad51..24c65a3d3c 100644 --- a/src/Worker/UpdateContact.php +++ b/src/Worker/UpdateContact.php @@ -7,10 +7,12 @@ namespace Friendica\Worker; +use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Network\HTTPException\InternalServerErrorException; +use Friendica\Util\DateTimeFormat; class UpdateContact { @@ -54,4 +56,38 @@ class UpdateContact DI::logger()->debug('Update contact', ['id' => $contact_id]); return Worker::add($run_parameters, 'UpdateContact', $contact_id); } + + public static function isUpdatable(int $contact_id): bool + { + $contact = Contact::selectFirst(['next-update', 'local-data', 'url', 'network', 'uid'], ['id' => $contact_id]); + if (empty($contact)) { + return false; + } + + if ($contact['next-update'] > DateTimeFormat::utcNow()) { + return false; + } + + if (DI::config()->get('system', 'update_known_contacts') && ($contact['uid'] == 0) && !Contact::hasRelations($contact_id)) { + Logger::debug('No local relations, contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + return false; + } + + if (DI::config()->get('system', 'update_active_contacts') && $contact['local-data']) { + Logger::debug('No local data, contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + return false; + } + + if (Contact::isLocal($contact['url'])) { + Logger::debug('Local contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + return false; + } + + if (!Protocol::supportsProbe($contact['network'])) { + Logger::debug('Contact does not support probe, it will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + return false; + } + + return true; + } } diff --git a/static/settings.config.php b/static/settings.config.php index 68418f6ff3..869065ce6e 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -257,6 +257,10 @@ return [ // When activated, only public contacts will be activated regularly that are used for example in items or tags. 'update_active_contacts' => false, + // update_known_contacts (Boolean) + // When activated, only public contacts will be activated regularly that are in a contact list of a local user. + 'update_known_contacts' => false, + // url (String) // The fully-qualified URL of this Friendica node. // Used by the worker in a non-HTTP execution environment. diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 32b8f6e97c..971063d596 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2025.02-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-04 20:55-0500\n" +"POT-Creation-Date: 2025-01-15 07:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -297,8 +297,8 @@ msgstr "" #: src/Module/Debug/ActivityPubConversion.php:128 #: src/Module/Debug/Babel.php:279 src/Module/Debug/Localtime.php:50 #: src/Module/Debug/Probe.php:40 src/Module/Debug/WebFinger.php:37 -#: src/Module/FriendSuggest.php:132 src/Module/Install.php:220 -#: src/Module/Install.php:260 src/Module/Install.php:295 +#: src/Module/FriendSuggest.php:132 src/Module/Install.php:219 +#: src/Module/Install.php:259 src/Module/Install.php:296 #: src/Module/Invite.php:162 src/Module/Item/Compose.php:185 #: src/Module/Moderation/Item/Source.php:74 #: src/Module/Moderation/Report/Create.php:154 @@ -646,7 +646,7 @@ msgstr "" msgid "Map" msgstr "" -#: src/App.php:394 +#: src/App.php:369 msgid "Apologies but the website is unavailable at the moment." msgstr "" @@ -765,15 +765,15 @@ msgstr "" msgid "No system theme config value set." msgstr "" -#: src/BaseModule.php:395 +#: src/BaseModule.php:409 msgid "The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: src/BaseModule.php:422 +#: src/BaseModule.php:436 msgid "All contacts" msgstr "" -#: src/BaseModule.php:427 src/Content/Conversation/Factory/Channel.php:32 +#: src/BaseModule.php:441 src/Content/Conversation/Factory/Channel.php:32 #: src/Content/Widget.php:254 src/Core/ACL.php:182 src/Module/Contact.php:395 #: src/Module/Privacy/PermissionTooltip.php:150 #: src/Module/Privacy/PermissionTooltip.php:172 @@ -781,28 +781,28 @@ msgstr "" msgid "Followers" msgstr "" -#: src/BaseModule.php:432 src/Content/Widget.php:255 src/Module/Contact.php:398 +#: src/BaseModule.php:446 src/Content/Widget.php:255 src/Module/Contact.php:398 #: src/Module/Settings/Channels.php:145 msgid "Following" msgstr "" -#: src/BaseModule.php:437 src/Content/Widget.php:256 src/Module/Contact.php:401 +#: src/BaseModule.php:451 src/Content/Widget.php:256 src/Module/Contact.php:401 msgid "Mutual friends" msgstr "" -#: src/BaseModule.php:445 +#: src/BaseModule.php:459 msgid "Common" msgstr "" -#: src/Console/Addon.php:162 src/Console/Addon.php:186 +#: src/Console/Addon.php:163 src/Console/Addon.php:187 msgid "Addon not found" msgstr "" -#: src/Console/Addon.php:166 +#: src/Console/Addon.php:167 msgid "Addon already enabled" msgstr "" -#: src/Console/Addon.php:190 +#: src/Console/Addon.php:191 msgid "Addon already disabled" msgstr "" @@ -1745,7 +1745,7 @@ msgid "Display posts done by accounts with the selected account type." msgstr "" #: src/Content/Feature.php:120 src/Content/Widget.php:610 -#: src/Module/Admin/Site.php:464 src/Module/BaseSettings.php:113 +#: src/Module/Admin/Site.php:466 src/Module/BaseSettings.php:113 #: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:323 msgid "Channels" msgstr "" @@ -1857,31 +1857,31 @@ msgstr "" msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:420 src/Model/Contact.php:1245 +#: src/Content/Item.php:420 src/Model/Contact.php:1254 msgid "View Status" msgstr "" -#: src/Content/Item.php:421 src/Content/Item.php:444 src/Model/Contact.php:1180 -#: src/Model/Contact.php:1236 src/Model/Contact.php:1246 +#: src/Content/Item.php:421 src/Content/Item.php:444 src/Model/Contact.php:1189 +#: src/Model/Contact.php:1245 src/Model/Contact.php:1255 #: src/Module/Directory.php:143 src/Module/Settings/Profile/Index.php:250 msgid "View Profile" msgstr "" -#: src/Content/Item.php:422 src/Model/Contact.php:1247 +#: src/Content/Item.php:422 src/Model/Contact.php:1256 msgid "View Photos" msgstr "" -#: src/Content/Item.php:423 src/Model/Contact.php:1214 +#: src/Content/Item.php:423 src/Model/Contact.php:1223 #: src/Model/Profile.php:446 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:424 src/Model/Contact.php:1238 -#: src/Model/Contact.php:1249 +#: src/Content/Item.php:424 src/Model/Contact.php:1247 +#: src/Model/Contact.php:1258 msgid "View Contact" msgstr "" -#: src/Content/Item.php:425 src/Model/Contact.php:1250 +#: src/Content/Item.php:425 src/Model/Contact.php:1259 msgid "Send PM" msgstr "" @@ -1921,7 +1921,7 @@ msgid "Search Text" msgstr "" #: src/Content/Item.php:441 src/Content/Widget.php:66 -#: src/Model/Contact.php:1239 src/Model/Contact.php:1251 +#: src/Model/Contact.php:1248 src/Model/Contact.php:1260 #: src/Module/Contact/Follow.php:152 view/theme/vier/theme.php:183 msgid "Connect/Follow" msgstr "" @@ -2397,7 +2397,7 @@ msgstr "" msgid "Organisations" msgstr "" -#: src/Content/Widget.php:554 src/Model/Contact.php:1751 +#: src/Content/Widget.php:554 src/Model/Contact.php:1758 msgid "News" msgstr "" @@ -2451,12 +2451,12 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:95 src/Model/Contact.php:1208 +#: src/Content/Widget/VCard.php:95 src/Model/Contact.php:1217 #: src/Model/Profile.php:440 msgid "Post to group" msgstr "" -#: src/Content/Widget/VCard.php:100 src/Model/Contact.php:1212 +#: src/Content/Widget/VCard.php:100 src/Model/Contact.php:1221 #: src/Model/Profile.php:444 src/Module/Moderation/Item/Source.php:80 msgid "Mention" msgstr "" @@ -2484,13 +2484,13 @@ msgstr "" msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:119 src/Model/Contact.php:1240 -#: src/Model/Contact.php:1252 src/Model/Profile.php:457 +#: src/Content/Widget/VCard.php:119 src/Model/Contact.php:1249 +#: src/Model/Contact.php:1261 src/Model/Profile.php:457 #: src/Module/Contact/Profile.php:476 msgid "Unfollow" msgstr "" -#: src/Content/Widget/VCard.php:125 src/Model/Contact.php:1210 +#: src/Content/Widget/VCard.php:125 src/Model/Contact.php:1219 #: src/Model/Profile.php:442 msgid "View group" msgstr "" @@ -2557,8 +2557,8 @@ msgstr "" msgid "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql." msgstr "" -#: src/Core/Installer.php:184 src/Module/Install.php:193 -#: src/Module/Install.php:336 +#: src/Core/Installer.php:184 src/Module/Install.php:192 +#: src/Module/Install.php:337 msgid "Please see the file \"doc/INSTALL.md\"." msgstr "" @@ -3194,84 +3194,84 @@ msgstr "" msgid "Edit circles" msgstr "" -#: src/Model/Contact.php:1259 src/Module/Moderation/Users/Pending.php:88 +#: src/Model/Contact.php:1268 src/Module/Moderation/Users/Pending.php:88 #: src/Module/Notifications/Introductions.php:124 #: src/Module/Notifications/Introductions.php:197 msgid "Approve" msgstr "" -#: src/Model/Contact.php:1595 src/Model/Contact.php:1667 +#: src/Model/Contact.php:1602 src/Model/Contact.php:1674 #: src/Module/Contact/Profile.php:360 #, php-format msgid "%s has blocked you" msgstr "" -#: src/Model/Contact.php:1747 +#: src/Model/Contact.php:1754 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1755 +#: src/Model/Contact.php:1762 msgid "Group" msgstr "" -#: src/Model/Contact.php:1759 src/Module/Moderation/BaseUsers.php:122 +#: src/Model/Contact.php:1766 src/Module/Moderation/BaseUsers.php:122 msgid "Relay" msgstr "" -#: src/Model/Contact.php:3085 +#: src/Model/Contact.php:3092 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:3090 src/Module/Friendica.php:88 +#: src/Model/Contact.php:3097 src/Module/Friendica.php:88 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:3095 +#: src/Model/Contact.php:3102 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:3104 +#: src/Model/Contact.php:3111 msgid "The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:3122 +#: src/Model/Contact.php:3129 #, php-format msgid "Expected network %s does not match actual network %s" msgstr "" -#: src/Model/Contact.php:3139 +#: src/Model/Contact.php:3146 msgid "This seems to be a relay account. They can't be followed by users." msgstr "" -#: src/Model/Contact.php:3146 +#: src/Model/Contact.php:3153 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:3148 +#: src/Model/Contact.php:3155 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:3151 +#: src/Model/Contact.php:3158 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:3154 +#: src/Model/Contact.php:3161 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:3157 +#: src/Model/Contact.php:3164 msgid "Unable to match @-style Identity Address with a known protocol or email contact." msgstr "" -#: src/Model/Contact.php:3158 +#: src/Model/Contact.php:3165 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:3164 +#: src/Model/Contact.php:3171 msgid "Limited profile. This person will be unable to receive direct/personal notifications from you." msgstr "" -#: src/Model/Contact.php:3223 +#: src/Model/Contact.php:3230 msgid "Unable to retrieve contact information." msgstr "" @@ -3469,7 +3469,7 @@ msgstr "" msgid "[no subject]" msgstr "" -#: src/Model/Photo.php:1192 src/Module/Media/Photo/Upload.php:154 +#: src/Model/Photo.php:1195 src/Module/Media/Photo/Upload.php:154 msgid "Wall Photos" msgstr "" @@ -3885,7 +3885,7 @@ msgstr "" #: src/Module/Admin/Addons/Details.php:95 src/Module/Admin/Addons/Index.php:59 #: src/Module/Admin/Federation.php:213 src/Module/Admin/Logs/Settings.php:74 #: src/Module/Admin/Logs/View.php:71 src/Module/Admin/Queue.php:59 -#: src/Module/Admin/Site.php:447 src/Module/Admin/Storage.php:124 +#: src/Module/Admin/Site.php:449 src/Module/Admin/Storage.php:124 #: src/Module/Admin/Summary.php:173 src/Module/Admin/Themes/Details.php:82 #: src/Module/Admin/Themes/Index.php:103 src/Module/Admin/Tos.php:63 #: src/Module/Moderation/Users/Create.php:47 @@ -3923,7 +3923,7 @@ msgid "Addon %s failed to install." msgstr "" #: src/Module/Admin/Addons/Index.php:61 src/Module/Admin/Features.php:69 -#: src/Module/Admin/Logs/Settings.php:76 src/Module/Admin/Site.php:450 +#: src/Module/Admin/Logs/Settings.php:76 src/Module/Admin/Site.php:452 #: src/Module/Admin/Themes/Index.php:105 src/Module/Admin/Tos.php:72 #: src/Module/Settings/Account.php:507 src/Module/Settings/Addons.php:64 #: src/Module/Settings/Connectors.php:143 @@ -4124,8 +4124,8 @@ msgid "Enable Debugging" msgstr "" #: src/Module/Admin/Logs/Settings.php:80 src/Module/Admin/Logs/Settings.php:81 -#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:470 -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:480 msgid "Read-only because it is set by an environment variable" msgstr "" @@ -4274,257 +4274,257 @@ msgstr "" msgid "Priority" msgstr "" -#: src/Module/Admin/Site.php:230 +#: src/Module/Admin/Site.php:232 #, php-format msgid "%s is no valid input for maximum media size" msgstr "" -#: src/Module/Admin/Site.php:235 +#: src/Module/Admin/Site.php:237 #, php-format msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:362 src/Module/Settings/Display.php:212 +#: src/Module/Admin/Site.php:364 src/Module/Settings/Display.php:212 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:379 src/Module/Settings/Display.php:222 +#: src/Module/Admin/Site.php:381 src/Module/Settings/Display.php:222 #, php-format msgid "%s - (Experimental)" msgstr "" -#: src/Module/Admin/Site.php:391 +#: src/Module/Admin/Site.php:393 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:392 +#: src/Module/Admin/Site.php:394 msgid "No community page for visitors" msgstr "" -#: src/Module/Admin/Site.php:393 +#: src/Module/Admin/Site.php:395 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:394 +#: src/Module/Admin/Site.php:396 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:395 +#: src/Module/Admin/Site.php:397 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:401 +#: src/Module/Admin/Site.php:403 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:424 +#: src/Module/Admin/Site.php:426 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:425 +#: src/Module/Admin/Site.php:427 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:426 +#: src/Module/Admin/Site.php:428 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:430 +#: src/Module/Admin/Site.php:432 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:431 +#: src/Module/Admin/Site.php:433 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:432 +#: src/Module/Admin/Site.php:434 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:436 +#: src/Module/Admin/Site.php:438 msgid "none" msgstr "" -#: src/Module/Admin/Site.php:437 +#: src/Module/Admin/Site.php:439 msgid "Local contacts" msgstr "" -#: src/Module/Admin/Site.php:438 +#: src/Module/Admin/Site.php:440 msgid "Interactors" msgstr "" -#: src/Module/Admin/Site.php:448 src/Module/BaseAdmin.php:76 +#: src/Module/Admin/Site.php:450 src/Module/BaseAdmin.php:76 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:449 +#: src/Module/Admin/Site.php:451 msgid "General Information" msgstr "" -#: src/Module/Admin/Site.php:451 +#: src/Module/Admin/Site.php:453 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:452 src/Module/Register.php:146 +#: src/Module/Admin/Site.php:454 src/Module/Register.php:146 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:453 +#: src/Module/Admin/Site.php:455 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:454 +#: src/Module/Admin/Site.php:456 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:455 src/Module/Calendar/Event/Form.php:238 +#: src/Module/Admin/Site.php:457 src/Module/Calendar/Event/Form.php:238 #: src/Module/Contact.php:528 src/Module/Profile/Profile.php:267 msgid "Advanced" msgstr "" -#: src/Module/Admin/Site.php:456 +#: src/Module/Admin/Site.php:458 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:457 +#: src/Module/Admin/Site.php:459 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:458 +#: src/Module/Admin/Site.php:460 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:459 +#: src/Module/Admin/Site.php:461 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:460 +#: src/Module/Admin/Site.php:462 msgid "Use the command \"console relay\" in the command line to add or remove relays." msgstr "" -#: src/Module/Admin/Site.php:461 +#: src/Module/Admin/Site.php:463 msgid "The system is not subscribed to any relays at the moment." msgstr "" -#: src/Module/Admin/Site.php:462 +#: src/Module/Admin/Site.php:464 msgid "The system is currently subscribed to the following relays:" msgstr "" -#: src/Module/Admin/Site.php:465 +#: src/Module/Admin/Site.php:467 msgid "Relocate Node" msgstr "" -#: src/Module/Admin/Site.php:466 +#: src/Module/Admin/Site.php:468 msgid "Relocating your node enables you to change the DNS domain of this node and keep all the existing users and posts. This process takes a while and can only be started from the relocate console command like this:" msgstr "" -#: src/Module/Admin/Site.php:467 +#: src/Module/Admin/Site.php:469 msgid "(Friendica directory)# bin/console relocate https://newdomain.com" msgstr "" -#: src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:472 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:471 +#: src/Module/Admin/Site.php:473 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:471 +#: src/Module/Admin/Site.php:473 msgid "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:474 msgid "Name of the system actor" msgstr "" -#: src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:474 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:473 +#: src/Module/Admin/Site.php:475 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:474 +#: src/Module/Admin/Site.php:476 msgid "Email Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:475 +#: src/Module/Admin/Site.php:477 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:475 +#: src/Module/Admin/Site.php:477 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:476 +#: src/Module/Admin/Site.php:478 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:476 +#: src/Module/Admin/Site.php:478 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:477 +#: src/Module/Admin/Site.php:479 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:477 +#: src/Module/Admin/Site.php:479 #, php-format msgid "For public servers: you can add additional information here that will be listed at %s/servers." msgstr "" -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Site.php:480 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:481 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:481 #, php-format msgid "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:482 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:482 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:483 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:483 msgid "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops." msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:484 msgid "Show help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:484 msgid "Displays the menu entry for the Help pages from the navigation menu. It is always accessible by calling /help directly." msgstr "" -#: src/Module/Admin/Site.php:483 +#: src/Module/Admin/Site.php:485 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:483 +#: src/Module/Admin/Site.php:485 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:485 +#: src/Module/Admin/Site.php:487 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:485 +#: src/Module/Admin/Site.php:487 #, php-format msgid "" "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.\n" @@ -4532,27 +4532,27 @@ msgid "" "\t\t\t\t\t\t\t\t\t\t\t\t\tCurrently upload_max_filesize is set to %s (%s byte)" msgstr "" -#: src/Module/Admin/Site.php:489 +#: src/Module/Admin/Site.php:491 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:489 +#: src/Module/Admin/Site.php:491 msgid "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits." msgstr "" -#: src/Module/Admin/Site.php:490 +#: src/Module/Admin/Site.php:492 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:490 +#: src/Module/Admin/Site.php:492 msgid "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality." msgstr "" -#: src/Module/Admin/Site.php:491 +#: src/Module/Admin/Site.php:493 msgid "Maximum media file size" msgstr "" -#: src/Module/Admin/Site.php:491 +#: src/Module/Admin/Site.php:493 #, php-format msgid "" "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.\n" @@ -4560,739 +4560,747 @@ msgid "" "\t\t\t\t\t\t\t\t\t\t\t\t\tCurrently upload_max_filesize is set to %s (%s byte)" msgstr "" -#: src/Module/Admin/Site.php:496 +#: src/Module/Admin/Site.php:498 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:497 +#: src/Module/Admin/Site.php:499 msgid "Maximum Users" msgstr "" -#: src/Module/Admin/Site.php:497 +#: src/Module/Admin/Site.php:499 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:498 +#: src/Module/Admin/Site.php:500 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:498 +#: src/Module/Admin/Site.php:500 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:499 +#: src/Module/Admin/Site.php:501 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:499 +#: src/Module/Admin/Site.php:501 msgid "Will be displayed prominently on the registration page. You can use BBCode here." msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:502 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:502 msgid "Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142." msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:503 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:503 msgid "Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:504 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:504 msgid "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: src/Module/Admin/Site.php:503 +#: src/Module/Admin/Site.php:505 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:503 +#: src/Module/Admin/Site.php:505 msgid "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:506 msgid "Disallowed email domains" msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:506 msgid "Comma separated list of domains which are rejected as email addresses for registrations to this site. Wildcards are accepted." msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:507 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:507 msgid "Don't show the rich content (e.g. embedded PDF), except from the domains listed below." msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:508 msgid "Trusted third-party domains" msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:508 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:509 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:509 msgid "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in." msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:510 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:510 msgid "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:510 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:511 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:511 msgid "URL to the global directory. If this is not set, the global directory is completely unavailable to the application." msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:512 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:512 msgid "Set default post permissions for all new members to the default privacy circle rather than public." msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:513 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:513 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:514 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:514 msgid "Checking this box will restrict addons listed in the apps menu to members only." msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:515 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:515 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:514 +#: src/Module/Admin/Site.php:516 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:514 +#: src/Module/Admin/Site.php:516 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:517 msgid "Only local search" msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:517 msgid "Blocks search for users who are not logged in to prevent crawlers from blocking your system." msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:518 msgid "Blocked tags for trending tags" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:518 msgid "Comma separated list of hashtags that shouldn't be displayed in the trending tags." msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:519 msgid "Cache contact avatars" msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:519 msgid "Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance." msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:520 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:520 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:521 msgid "Allow Users to set up relay channels" msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:521 msgid "If enabled, it is possible to create relay users that are used to reshare content based on user defined channels." msgstr "" -#: src/Module/Admin/Site.php:520 +#: src/Module/Admin/Site.php:522 msgid "Adjust the feed poll frequency" msgstr "" -#: src/Module/Admin/Site.php:520 +#: src/Module/Admin/Site.php:522 msgid "Automatically detect and set the best feed poll frequency." msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:523 msgid "Minimum poll interval" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:523 msgid "Minimal distance in minutes between two polls for mail and feed contacts. Reasonable values are between 1 and 59." msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:524 msgid "Enable multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:524 msgid "Enable users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:525 msgid "Enable OpenID" msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:525 msgid "Enable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:526 msgid "Enable full name check" msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:526 msgid "Prevents users from registering with a display name with fewer than two parts separated by spaces." msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:527 msgid "Email administrators on new registration" msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:527 msgid "If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators." msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:528 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:528 msgid "Which community pages should be available for visitors. Local users always see both pages." msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:529 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:529 msgid "The maximum number of posts per user on the local community page. This is useful, when a single user floods the local community page." msgstr "" -#: src/Module/Admin/Site.php:528 +#: src/Module/Admin/Site.php:530 msgid "Posts per server on community page" msgstr "" -#: src/Module/Admin/Site.php:528 +#: src/Module/Admin/Site.php:530 msgid "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." msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:532 msgid "Enable Mail support" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:532 msgid "Enable built-in mail support to poll IMAP folders and to reply via mail." msgstr "" -#: src/Module/Admin/Site.php:531 +#: src/Module/Admin/Site.php:533 msgid "Mail support can't be enabled because the PHP IMAP module is not installed." msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:535 msgid "Diaspora support can't be enabled because Friendica was installed into a sub directory." msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:536 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:536 msgid "Enable built-in Diaspora network compatibility for communicating with diaspora servers." msgstr "" -#: src/Module/Admin/Site.php:535 +#: src/Module/Admin/Site.php:537 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:535 +#: src/Module/Admin/Site.php:537 msgid "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites." msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:538 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:538 msgid "User name for the proxy server." msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:539 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:539 msgid "If you want to use a proxy server that Friendica should use to connect to the network, put the URL of the proxy here." msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:540 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:540 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:539 +#: src/Module/Admin/Site.php:541 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:539 +#: src/Module/Admin/Site.php:541 #, php-format msgid "Maximum system load before delivery and poll processes are deferred - default %d." msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:542 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:542 msgid "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:543 msgid "Periodically optimize tables" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:543 msgid "Periodically optimize tables like the cache and the workerqueue" msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:545 msgid "Discover followers/followings from contacts" msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:545 msgid "If enabled, contacts are checked for their followers and following contacts." msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:546 msgid "None - deactivated" msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:547 msgid "Local contacts - contacts of our local contacts are discovered for their followers/followings." msgstr "" -#: src/Module/Admin/Site.php:546 +#: src/Module/Admin/Site.php:548 msgid "Interactors - contacts of our local contacts and contacts who interacted on locally visible postings are discovered for their followers/followings." msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:550 msgid "Only update contacts/servers with local data" msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:550 msgid "If enabled, the system will only look for changes in contacts and servers that engaged on this system by either being in a contact list of a user or when posts or comments exists from the contact on this system." msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:551 +msgid "Only update contacts with relations" +msgstr "" + +#: src/Module/Admin/Site.php:551 +msgid "If enabled, the system will only look for changes in contacts that are in a contact list of a user on this system." +msgstr "" + +#: src/Module/Admin/Site.php:552 msgid "Synchronize the contacts with the directory server" msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:552 msgid "if enabled, the system will check periodically for new contacts on the defined directory server." msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:554 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:554 msgid "Periodically query other servers for contacts and servers that they know of. The system queries Friendica, Mastodon and Hubzilla servers. Keep it deactivated on small machines to decrease the database size and load." msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:555 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:555 msgid "Number of days after which a server is requeried for their contacts and servers it knows of. This is only used when the discovery is activated." msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:556 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:556 msgid "Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated." msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:558 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:558 msgid "If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:560 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:560 msgid "Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview." msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:561 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:561 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:562 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:562 msgid "Remove old remote items, orphaned database records and old content from some other helper tables." msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:563 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:563 msgid "When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour." msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:564 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:564 msgid "When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:565 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:565 msgid "The conversation data is used for ActivityPub, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days." msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:566 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:566 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:564 +#: src/Module/Admin/Site.php:567 msgid "Maximum numbers of comments per post on the display page" msgstr "" -#: src/Module/Admin/Site.php:564 +#: src/Module/Admin/Site.php:567 msgid "How many comments should be shown on the single view for each post? Default value is 1000." msgstr "" -#: src/Module/Admin/Site.php:565 +#: src/Module/Admin/Site.php:568 msgid "Items per page" msgstr "" -#: src/Module/Admin/Site.php:565 +#: src/Module/Admin/Site.php:568 msgid "Number of items per page in stream pages (network, community, profile/contact statuses, search)." msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:569 msgid "Items per page for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:569 msgid "Number of items per page in stream pages (network, community, profile/contact statuses, search) for mobile devices." msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:570 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:570 msgid "If you have a restricted system where the webserver can't access the system temp path, enter another path here." msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:571 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:571 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:572 msgid "Limited search scope" msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:572 msgid "If enabled, searches will only be performed in the data used for the channels and not in all posts." msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:573 msgid "Maximum age of items in the search table" msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:573 msgid "Maximum age of items in the search table in days. Lower values will increase the performance and reduce disk usage. 0 means no age restriction." msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:574 msgid "Generate counts per contact circle when calculating network count" msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:574 msgid "On systems with users that heavily use contact circles the query can be very expensive." msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:575 msgid "Process \"view\" activities" msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:575 msgid "\"view\" activities are mostly geberated by Peertube systems. Per default they are not processed for performance reasons. Only activate this option on performant system." msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:576 msgid "Days, after which a contact is archived" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:576 msgid "Number of days that we try to deliver content or to update the contact data before we archive a contact." msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:578 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:578 #, php-format msgid "On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d." msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:579 msgid "Maximum load for workers" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:579 msgid "Maximum load that causes a cooldown before each worker function call." msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:580 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:580 msgid "When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority." msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:581 msgid "Decoupled receiver" msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:581 msgid "Decouple incoming ActivityPub posts by processing them in the background via a worker process. Only enable this on fast systems." msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:582 msgid "Cron interval" msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:582 msgid "Minimal period in minutes between two calls of the \"Cron\" worker job." msgstr "" -#: src/Module/Admin/Site.php:580 +#: src/Module/Admin/Site.php:583 msgid "Worker defer limit" msgstr "" -#: src/Module/Admin/Site.php:580 +#: src/Module/Admin/Site.php:583 msgid "Per default the systems tries delivering for 15 times before dropping it." msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:584 msgid "Worker fetch limit" msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:584 msgid "Number of worker tasks that are fetched in a single query. Higher values should increase the performance, too high values will mostly likely decrease it. Only change it, when you know how to measure the performance of your system." msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:586 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:586 msgid "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:587 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:587 msgid "Can be \"all\" or \"tags\". \"all\" means that every public post should be received. \"tags\" means that only posts with selected tags should be received." msgstr "" -#: src/Module/Admin/Site.php:584 src/Module/Contact/Profile.php:315 +#: src/Module/Admin/Site.php:587 src/Module/Contact/Profile.php:315 #: src/Module/Settings/Display.php:259 #: src/Module/Settings/TwoFactor/Index.php:132 msgid "Disabled" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:587 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:587 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:588 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:588 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:586 +#: src/Module/Admin/Site.php:589 msgid "Deny Server tags" msgstr "" -#: src/Module/Admin/Site.php:586 +#: src/Module/Admin/Site.php:589 msgid "Comma separated list of tags that are rejected." msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:590 msgid "Maximum amount of tags" msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:590 msgid "Maximum amount of tags in a post before it is rejected as spam. The post has to contain at least one link. Posts from subscribed accounts will not be rejected." msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:591 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:591 msgid "If enabled, the tags from the saved searches will used for the \"tags\" subscription in addition to the \"relay_server_tags\"." msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:592 msgid "Deny undetected languages" msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:592 msgid "If enabled, posts with undetected languages will be rejected." msgstr "" -#: src/Module/Admin/Site.php:590 +#: src/Module/Admin/Site.php:593 msgid "Language Quality" msgstr "" -#: src/Module/Admin/Site.php:590 +#: src/Module/Admin/Site.php:593 msgid "The minimum language quality that is required to accept the post." msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:594 msgid "Number of languages for the language detection" msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:594 msgid "The system detects a list of languages per post. Only if the desired languages are in the list, the message will be accepted. The higher the number, the more posts will be falsely detected." msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:596 msgid "Maximum age of channel" msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:596 msgid "This defines the maximum age in hours of items that should be displayed in channels. This affects the channel performance." msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:597 msgid "Maximum number of channel posts" msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:597 msgid "For performance reasons, the channels use a dedicated table to store content. The higher the value the slower the channels." msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:598 msgid "Interaction score days" msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:598 msgid "Number of days that are used to calculate the interaction score." msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:599 msgid "Maximum number of posts per author" msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:599 msgid "Maximum number of posts per page by author if the contact frequency is set to \"Display only few posts\". If there are more posts, then the post with the most interactions will be displayed." msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:600 msgid "Sharer interaction days" msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:600 msgid "Number of days of the last interaction that are used to define which sharers are used for the \"sharers of sharers\" channel." msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:603 msgid "Start Relocation" msgstr "" @@ -5837,12 +5845,12 @@ msgstr "" #: src/Module/Calendar/Event/Form.php:195 #: src/Module/Calendar/Event/Form.php:223 src/Module/Debug/Probe.php:45 -#: src/Module/Install.php:187 src/Module/Install.php:213 -#: src/Module/Install.php:218 src/Module/Install.php:232 -#: src/Module/Install.php:241 src/Module/Install.php:246 -#: src/Module/Install.php:252 src/Module/Install.php:257 -#: src/Module/Install.php:271 src/Module/Install.php:284 -#: src/Module/Install.php:311 +#: src/Module/Install.php:186 src/Module/Install.php:212 +#: src/Module/Install.php:217 src/Module/Install.php:231 +#: src/Module/Install.php:240 src/Module/Install.php:245 +#: src/Module/Install.php:251 src/Module/Install.php:256 +#: src/Module/Install.php:270 src/Module/Install.php:283 +#: src/Module/Install.php:312 #: src/Module/Moderation/Blocklist/Server/Add.php:125 #: src/Module/Moderation/Blocklist/Server/Add.php:127 #: src/Module/Moderation/Blocklist/Server/Import.php:116 @@ -7097,132 +7105,132 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: src/Module/Install.php:175 +#: src/Module/Install.php:174 msgid "Friendica Communications Server - Setup" msgstr "" -#: src/Module/Install.php:186 +#: src/Module/Install.php:185 msgid "System check" msgstr "" -#: src/Module/Install.php:188 src/Module/Install.php:233 -#: src/Module/Install.php:312 +#: src/Module/Install.php:187 src/Module/Install.php:232 +#: src/Module/Install.php:313 msgid "Requirement not satisfied" msgstr "" -#: src/Module/Install.php:189 +#: src/Module/Install.php:188 msgid "Optional requirement not satisfied" msgstr "" -#: src/Module/Install.php:190 +#: src/Module/Install.php:189 msgid "OK" msgstr "" -#: src/Module/Install.php:194 +#: src/Module/Install.php:193 msgid "Next" msgstr "" -#: src/Module/Install.php:195 +#: src/Module/Install.php:194 msgid "Check again" msgstr "" -#: src/Module/Install.php:208 +#: src/Module/Install.php:207 msgid "Base settings" msgstr "" -#: src/Module/Install.php:210 +#: src/Module/Install.php:209 msgid "Base path to installation" msgstr "" -#: src/Module/Install.php:212 +#: src/Module/Install.php:211 msgid "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot." msgstr "" -#: src/Module/Install.php:215 +#: src/Module/Install.php:214 msgid "The Friendica system URL" msgstr "" -#: src/Module/Install.php:217 +#: src/Module/Install.php:216 msgid "Overwrite this field in case the system URL determination isn't right, otherwise leave it as is." msgstr "" -#: src/Module/Install.php:228 +#: src/Module/Install.php:227 msgid "Database connection" msgstr "" -#: src/Module/Install.php:229 +#: src/Module/Install.php:228 msgid "In order to install Friendica we need to know how to connect to your database." msgstr "" -#: src/Module/Install.php:230 +#: src/Module/Install.php:229 msgid "Please contact your hosting provider or site administrator if you have questions about these settings." msgstr "" -#: src/Module/Install.php:231 +#: src/Module/Install.php:230 msgid "The database you specify below should already exist. If it does not, please create it before continuing." msgstr "" -#: src/Module/Install.php:238 +#: src/Module/Install.php:237 msgid "Database Server Name" msgstr "" -#: src/Module/Install.php:243 +#: src/Module/Install.php:242 msgid "Database Login Name" msgstr "" -#: src/Module/Install.php:249 +#: src/Module/Install.php:248 msgid "Database Login Password" msgstr "" -#: src/Module/Install.php:251 +#: src/Module/Install.php:250 msgid "For security reasons the password must not be empty" msgstr "" -#: src/Module/Install.php:254 +#: src/Module/Install.php:253 msgid "Database Name" msgstr "" -#: src/Module/Install.php:258 src/Module/Install.php:286 +#: src/Module/Install.php:257 src/Module/Install.php:286 msgid "Please select a default timezone for your website" msgstr "" -#: src/Module/Install.php:273 +#: src/Module/Install.php:272 msgid "Site settings" msgstr "" -#: src/Module/Install.php:281 +#: src/Module/Install.php:280 msgid "Site administrator email address" msgstr "" -#: src/Module/Install.php:283 +#: src/Module/Install.php:282 msgid "Your account email address must match this in order to use the web admin panel." msgstr "" -#: src/Module/Install.php:290 +#: src/Module/Install.php:291 msgid "System Language:" msgstr "" -#: src/Module/Install.php:292 +#: src/Module/Install.php:293 msgid "Set the default language for your Friendica installation interface and to send emails." msgstr "" -#: src/Module/Install.php:304 +#: src/Module/Install.php:305 msgid "Your Friendica site database has been installed." msgstr "" -#: src/Module/Install.php:314 +#: src/Module/Install.php:315 msgid "Installation finished" msgstr "" -#: src/Module/Install.php:334 +#: src/Module/Install.php:335 msgid "

    What next

    " msgstr "" -#: src/Module/Install.php:335 +#: src/Module/Install.php:336 msgid "IMPORTANT: You will need to [manually] setup a scheduled task for the worker." msgstr "" -#: src/Module/Install.php:338 +#: src/Module/Install.php:339 #, php-format msgid "Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel." msgstr "" @@ -8436,21 +8444,21 @@ msgstr "" msgid "Search in Friendica %s" msgstr "" -#: src/Module/Photo.php:108 +#: src/Module/Photo.php:109 msgid "The Photo is not available." msgstr "" -#: src/Module/Photo.php:133 +#: src/Module/Photo.php:134 #, php-format msgid "The Photo with id %s is not available." msgstr "" -#: src/Module/Photo.php:178 +#: src/Module/Photo.php:179 #, php-format msgid "Invalid external resource with url %s." msgstr "" -#: src/Module/Photo.php:180 +#: src/Module/Photo.php:181 #, php-format msgid "Invalid photo with id %s." msgstr "" @@ -11728,7 +11736,7 @@ msgstr "" msgid "Quote shared by: %s" msgstr "" -#: src/Protocol/ActivityPub/Receiver.php:558 +#: src/Protocol/ActivityPub/Receiver.php:566 msgid "Chat" msgstr "" diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 35e46dd712..f4cfd5b41d 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -112,6 +112,7 @@

    {{$portable_contacts}}

    {{include file="field_select.tpl" field=$contact_discovery}} {{include file="field_checkbox.tpl" field=$update_active_contacts}} + {{include file="field_checkbox.tpl" field=$update_known_contacts}} {{include file="field_checkbox.tpl" field=$synchronize_directory}} {{include file="field_checkbox.tpl" field=$poco_discovery}} {{include file="field_input.tpl" field=$poco_requery_days}} diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index bc55ab9a62..ad2667dc7f 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -228,6 +228,7 @@
    {{include file="field_select.tpl" field=$contact_discovery}} {{include file="field_checkbox.tpl" field=$update_active_contacts}} + {{include file="field_checkbox.tpl" field=$update_known_contacts}} {{include file="field_checkbox.tpl" field=$synchronize_directory}} {{include file="field_checkbox.tpl" field=$poco_discovery}} {{include file="field_input.tpl" field=$poco_requery_days}} From 1eaab5e4107ef3a3ee23b7a990a0137f45138b45 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 15 Jan 2025 07:51:30 +0000 Subject: [PATCH 07/31] Issue 14692: Prevent loops with remote servers --- src/Util/HTTPSignature.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index a544119616..b4ecf32eb6 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -604,13 +604,14 @@ class HTTPSignature /** * Gets a signer from a given HTTP request * - * @param string $content - * @param array $http_headers + * @param string $content + * @param array $http_headers + * @param ?boolean $update true = always update, false = never update, null = update when not found or outdated * * @return string|null|false Signer * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function getSigner(string $content, array $http_headers) + public static function getSigner(string $content, array $http_headers, bool $update = null) { if (empty($http_headers['HTTP_SIGNATURE'])) { DI::logger()->debug('No HTTP_SIGNATURE header'); @@ -700,7 +701,7 @@ class HTTPSignature return false; } - $key = self::fetchKey($sig_block['keyId'], $actor); + $key = self::fetchKey($sig_block['keyId'], $actor, $update); if (empty($key)) { DI::logger()->info('Empty key'); return false; @@ -802,17 +803,18 @@ class HTTPSignature /** * fetches a key for a given id and actor * - * @param string $id - * @param string $actor + * @param string $id + * @param string $actor + * @param ?boolean $update true = always update, false = never update, null = update when not found or outdated * * @return array with actor url and public key * @throws \Exception */ - private static function fetchKey(string $id, string $actor): array + private static function fetchKey(string $id, string $actor, bool $update = null): array { $url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id); - $profile = APContact::getByURL($url); + $profile = APContact::getByURL($url, $update); if (!empty($profile)) { DI::logger()->info('Taking key from id', ['id' => $id]); return ['url' => $url, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']]; From b9f5a4f7453f6c5be2a0989023991a75b8c0a907 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 10:53:34 +0000 Subject: [PATCH 08/31] Rename back App::load() --- src/App.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index 73f2913b1a..776b5ea909 100644 --- a/src/App.php +++ b/src/App.php @@ -158,7 +158,7 @@ class App $this->session = $this->container->create(IHandleUserSessions::class); $this->appHelper = $this->container->create(AppHelper::class); - $this->loadSetupForFrontend( + $this->load( $request, $this->container->create(DbaDefinition::class), $this->container->create(ViewDefinition::class), @@ -272,7 +272,7 @@ class App /** * Load the whole app instance */ - private function loadSetupForFrontend(ServerRequestInterface $request, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) + private function load(ServerRequestInterface $request, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) { if ($this->config->get('system', 'ini_max_execution_time') !== false) { set_time_limit((int)$this->config->get('system', 'ini_max_execution_time')); From bf28afb65100cc2ae3bad5929d113639dc3101a0 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 11:56:23 +0000 Subject: [PATCH 09/31] Remove dependency for ServerRequestInterface in App::load() --- src/App.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.php b/src/App.php index 776b5ea909..5ee8562dbf 100644 --- a/src/App.php +++ b/src/App.php @@ -159,7 +159,7 @@ class App $this->appHelper = $this->container->create(AppHelper::class); $this->load( - $request, + $request->getServerParams(), $this->container->create(DbaDefinition::class), $this->container->create(ViewDefinition::class), ); @@ -272,7 +272,7 @@ class App /** * Load the whole app instance */ - private function load(ServerRequestInterface $request, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) + private function load(array $serverParams, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) { if ($this->config->get('system', 'ini_max_execution_time') !== false) { set_time_limit((int)$this->config->get('system', 'ini_max_execution_time')); @@ -294,7 +294,7 @@ class App if ($this->mode->has(Mode::DBAVAILABLE)) { Core\Hook::loadHooks(); - $loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $request->getServerParams()); + $loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $serverParams); Core\Hook::callAll('load_config', $loader); // Hooks are now working, reload the whole definitions with hook enabled From 064b70f4c0f1318d5993f2fe830fa359bedacf53 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 11:59:24 +0000 Subject: [PATCH 10/31] Move Mode::setExecutor() call inside App::runFrontend() --- src/App.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index 5ee8562dbf..6546d56778 100644 --- a/src/App.php +++ b/src/App.php @@ -166,8 +166,6 @@ class App $this->registerTemplateEngine(); - $this->mode->setExecutor(Mode::INDEX); - $this->runFrontend( $this->container->create(IManagePersonalConfigValues::class), $this->container->create(Page::class), @@ -348,6 +346,8 @@ class App float $start_time, ServerRequestInterface $request ) { + $this->mode->setExecutor(Mode::INDEX); + $httpInput = new HTTPInputData($request->getServerParams()); $serverVars = $request->getServerParams(); $queryVars = $request->getQueryParams(); From 76aec2d5750f10eeb2603972ac0eb9bbc62a28c8 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 12:06:53 +0000 Subject: [PATCH 11/31] Inject Mode into App::load() via parameter --- src/App.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index 6546d56778..c823cfd5b3 100644 --- a/src/App.php +++ b/src/App.php @@ -162,6 +162,7 @@ class App $request->getServerParams(), $this->container->create(DbaDefinition::class), $this->container->create(ViewDefinition::class), + $this->mode, ); $this->registerTemplateEngine(); @@ -270,7 +271,7 @@ class App /** * Load the whole app instance */ - private function load(array $serverParams, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) + private function load(array $serverParams, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition, Mode $mode) { if ($this->config->get('system', 'ini_max_execution_time') !== false) { set_time_limit((int)$this->config->get('system', 'ini_max_execution_time')); @@ -290,7 +291,7 @@ class App $this->profiler->reset(); - if ($this->mode->has(Mode::DBAVAILABLE)) { + if ($mode->has(Mode::DBAVAILABLE)) { Core\Hook::loadHooks(); $loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $serverParams); Core\Hook::callAll('load_config', $loader); From 52c6f93c9adc497decc7abf75b17ecf345b279da Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 12:11:06 +0000 Subject: [PATCH 12/31] Inject Mode into App::runFrontend() via parameter --- src/App.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/App.php b/src/App.php index c823cfd5b3..6cda9d989b 100644 --- a/src/App.php +++ b/src/App.php @@ -168,6 +168,7 @@ class App $this->registerTemplateEngine(); $this->runFrontend( + $this->mode, $this->container->create(IManagePersonalConfigValues::class), $this->container->create(Page::class), $this->container->create(Nav::class), @@ -340,6 +341,7 @@ class App * @throws \ImagickException */ private function runFrontend( + Mode $mode, IManagePersonalConfigValues $pconfig, Page $page, Nav $nav, @@ -347,7 +349,7 @@ class App float $start_time, ServerRequestInterface $request ) { - $this->mode->setExecutor(Mode::INDEX); + $mode->setExecutor(Mode::INDEX); $httpInput = new HTTPInputData($request->getServerParams()); $serverVars = $request->getServerParams(); @@ -366,11 +368,11 @@ class App try { // Missing DB connection: ERROR - if ($this->mode->has(Mode::LOCALCONFIGPRESENT) && !$this->mode->has(Mode::DBAVAILABLE)) { + if ($mode->has(Mode::LOCALCONFIGPRESENT) && !$mode->has(Mode::DBAVAILABLE)) { throw new HTTPException\InternalServerErrorException($this->l10n->t('Apologies but the website is unavailable at the moment.')); } - if (!$this->mode->isInstall()) { + if (!$mode->isInstall()) { // Force SSL redirection if ($this->config->get('system', 'force_ssl') && (empty($serverVars['HTTPS']) || $serverVars['HTTPS'] === 'off') && @@ -384,7 +386,7 @@ class App DID::routeRequest($this->args->getCommand(), $serverVars); - if ($this->mode->isNormal() && !$this->mode->isBackend()) { + if ($mode->isNormal() && !$mode->isBackend()) { $requester = HTTPSignature::getSigner('', $serverVars); if (!empty($requester)) { OpenWebAuth::addVisitorCookieForHandle($requester); @@ -392,7 +394,7 @@ class App } // ZRL - if (!empty($queryVars['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !$this->session->getLocalUserId()) { + if (!empty($queryVars['zrl']) && $mode->isNormal() && !$mode->isBackend() && !$this->session->getLocalUserId()) { // Only continue when the given profile link seems valid. // Valid profile links contain a path with "/profile/" and no query parameters if ((parse_url($queryVars['zrl'], PHP_URL_QUERY) == '') && @@ -407,12 +409,12 @@ class App } } - if (!empty($queryVars['owt']) && $this->mode->isNormal()) { + if (!empty($queryVars['owt']) && $mode->isNormal()) { $token = $queryVars['owt']; OpenWebAuth::init($token); } - if (!$this->mode->isBackend()) { + if (!$mode->isBackend()) { $this->auth->withSession(); } @@ -428,7 +430,7 @@ class App // in install mode, any url loads install module // but we need "view" module for stylesheet - if ($this->mode->isInstall() && $moduleName !== 'install') { + if ($mode->isInstall() && $moduleName !== 'install') { $this->baseURL->redirect('install'); } else { Core\Update::check($this->appHelper->getBasePath(), false); @@ -478,7 +480,7 @@ class App $page['page_title'] = $moduleName; // The "view" module is required to show the theme CSS - if (!$this->mode->isInstall() && !$this->mode->has(Mode::MAINTENANCEDISABLED) && $moduleName !== 'view') { + if (!$mode->isInstall() && !$mode->has(Mode::MAINTENANCEDISABLED) && $moduleName !== 'view') { $module = $this->createModuleInstance(Maintenance::class); } else { // determine the module class and save it to the module instance @@ -500,7 +502,7 @@ class App // Wrapping HTML responses in the theme template if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) { - $response = $page->run($this->appHelper, $this->session, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); + $response = $page->run($this->appHelper, $this->session, $this->baseURL, $this->args, $mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); } $this->logger->debug('Request processed sucessfully', ['response' => $response->getStatusCode(), 'address' => $serverVars['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $serverVars['HTTP_REFERER'] ?? '', 'user-agent' => $serverVars['HTTP_USER_AGENT'] ?? '', 'duration' => number_format(microtime(true) - $request_start, 3)]); From fdb14f23f26dc935bb8108c030796b9d9c52f822 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 12:13:57 +0000 Subject: [PATCH 13/31] Inject config into App::load() via parameter --- src/App.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/App.php b/src/App.php index 6cda9d989b..af8c391426 100644 --- a/src/App.php +++ b/src/App.php @@ -163,6 +163,7 @@ class App $this->container->create(DbaDefinition::class), $this->container->create(ViewDefinition::class), $this->mode, + $this->config, ); $this->registerTemplateEngine(); @@ -272,14 +273,19 @@ class App /** * Load the whole app instance */ - private function load(array $serverParams, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition, Mode $mode) - { - if ($this->config->get('system', 'ini_max_execution_time') !== false) { - set_time_limit((int)$this->config->get('system', 'ini_max_execution_time')); + private function load( + array $serverParams, + DbaDefinition $dbaDefinition, + ViewDefinition $viewDefinition, + Mode $mode, + IManageConfigValues $config + ): void { + if ($config->get('system', 'ini_max_execution_time') !== false) { + set_time_limit((int) $config->get('system', 'ini_max_execution_time')); } - if ($this->config->get('system', 'ini_pcre_backtrack_limit') !== false) { - ini_set('pcre.backtrack_limit', (int)$this->config->get('system', 'ini_pcre_backtrack_limit')); + if ($config->get('system', 'ini_pcre_backtrack_limit') !== false) { + ini_set('pcre.backtrack_limit', (int) $config->get('system', 'ini_pcre_backtrack_limit')); } // Normally this constant is defined - but not if "pcntl" isn't installed From 6c0a2eaefc385f2776224f73e07238c10aa81c33 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 12:36:14 +0000 Subject: [PATCH 14/31] Inject config into App::loadDefaultTimezone() via parameter --- src/App.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.php b/src/App.php index af8c391426..41ae4fd1b7 100644 --- a/src/App.php +++ b/src/App.php @@ -308,7 +308,7 @@ class App $viewDefinition->load(true); } - $this->loadDefaultTimezone(); + $this->loadDefaultTimezone($config); } /** @@ -318,10 +318,10 @@ class App * * @global string $default_timezone */ - private function loadDefaultTimezone() + private function loadDefaultTimezone(IManageConfigValues $config) { - if ($this->config->get('system', 'default_timezone')) { - $timezone = $this->config->get('system', 'default_timezone', 'UTC'); + if ($config->get('system', 'default_timezone')) { + $timezone = $config->get('system', 'default_timezone', 'UTC'); } else { global $default_timezone; $timezone = $default_timezone ?? '' ?: 'UTC'; From e57424ec35aa8df1ffdf2faf9713c1f699f2546d Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 12:46:24 +0000 Subject: [PATCH 15/31] Inject profiler into App::load() via parameter --- src/App.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index 41ae4fd1b7..af1147e091 100644 --- a/src/App.php +++ b/src/App.php @@ -164,6 +164,7 @@ class App $this->container->create(ViewDefinition::class), $this->mode, $this->config, + $this->profiler, ); $this->registerTemplateEngine(); @@ -278,7 +279,8 @@ class App DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition, Mode $mode, - IManageConfigValues $config + IManageConfigValues $config, + Profiler $profiler ): void { if ($config->get('system', 'ini_max_execution_time') !== false) { set_time_limit((int) $config->get('system', 'ini_max_execution_time')); @@ -296,7 +298,7 @@ class App // Ensure that all "strtotime" operations do run timezone independent date_default_timezone_set('UTC'); - $this->profiler->reset(); + $profiler->reset(); if ($mode->has(Mode::DBAVAILABLE)) { Core\Hook::loadHooks(); From 7cc37ff2cb972da993134c173e99b817a3778982 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 13:17:53 +0000 Subject: [PATCH 16/31] Inject AppHelper into App::load() via parameter --- src/App.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index af1147e091..6ebac26d49 100644 --- a/src/App.php +++ b/src/App.php @@ -165,6 +165,7 @@ class App $this->mode, $this->config, $this->profiler, + $this->appHelper, ); $this->registerTemplateEngine(); @@ -280,7 +281,8 @@ class App ViewDefinition $viewDefinition, Mode $mode, IManageConfigValues $config, - Profiler $profiler + Profiler $profiler, + AppHelper $appHelper ): void { if ($config->get('system', 'ini_max_execution_time') !== false) { set_time_limit((int) $config->get('system', 'ini_max_execution_time')); @@ -302,7 +304,7 @@ class App if ($mode->has(Mode::DBAVAILABLE)) { Core\Hook::loadHooks(); - $loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $serverParams); + $loader = (new Config())->createConfigFileManager($appHelper->getBasePath(), $serverParams); Core\Hook::callAll('load_config', $loader); // Hooks are now working, reload the whole definitions with hook enabled From 15446f35a5943d243521a53e76d90c40f6d709ff Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 13:19:17 +0000 Subject: [PATCH 17/31] Inject AppHelper into App::loadDefaultTimezone() via parameter --- src/App.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.php b/src/App.php index 6ebac26d49..8af9ec9272 100644 --- a/src/App.php +++ b/src/App.php @@ -312,7 +312,7 @@ class App $viewDefinition->load(true); } - $this->loadDefaultTimezone($config); + $this->loadDefaultTimezone($config, $appHelper); } /** @@ -322,7 +322,7 @@ class App * * @global string $default_timezone */ - private function loadDefaultTimezone(IManageConfigValues $config) + private function loadDefaultTimezone(IManageConfigValues $config, AppHelper $appHelper) { if ($config->get('system', 'default_timezone')) { $timezone = $config->get('system', 'default_timezone', 'UTC'); @@ -331,7 +331,7 @@ class App $timezone = $default_timezone ?? '' ?: 'UTC'; } - $this->appHelper->setTimeZone($timezone); + $appHelper->setTimeZone($timezone); } /** From c9bcc45d7cb578eaddcdf38afa55cd94669bd702 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 13:47:58 +0000 Subject: [PATCH 18/31] Provide $_SERVER to App::processConsole() --- bin/console.php | 2 +- bin/daemon.php | 4 +++- bin/jetstream.php | 4 +++- bin/worker.php | 4 +++- src/App.php | 5 ++++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bin/console.php b/bin/console.php index ad612f4363..a20f3f7e02 100755 --- a/bin/console.php +++ b/bin/console.php @@ -19,4 +19,4 @@ $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $app = \Friendica\App::fromContainer($container); -$app->processConsole($_SERVER['argv'] ?? []); +$app->processConsole($_SERVER); diff --git a/bin/daemon.php b/bin/daemon.php index 546f207e08..25f902eacd 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -24,11 +24,13 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; +// BC: Add console command as second argument $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "daemon"); +$_SERVER['argv'] = $argv; $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $app = \Friendica\App::fromContainer($container); -$app->processConsole($argv); +$app->processConsole($_SERVER); diff --git a/bin/jetstream.php b/bin/jetstream.php index 156f961856..b96dfa0e51 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -19,11 +19,13 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; +// BC: Add console command as second argument $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "jetstream"); +$_SERVER['argv'] = $argv; $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $app = \Friendica\App::fromContainer($container); -$app->processConsole($argv); +$app->processConsole($_SERVER); diff --git a/bin/worker.php b/bin/worker.php index a79d8836a7..b72a8e2514 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -21,11 +21,13 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; +// BC: Add console command as second argument $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "worker"); +$_SERVER['argv'] = $argv; $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $app = \Friendica\App::fromContainer($container); -$app->processConsole($argv); +$app->processConsole($_SERVER); diff --git a/src/App.php b/src/App.php index 8af9ec9272..6bdb20d45c 100644 --- a/src/App.php +++ b/src/App.php @@ -181,8 +181,11 @@ class App ); } - public function processConsole(array $argv): void + + public function processConsole(array $serverParams): void { + $argv = $serverParams['argv'] ?? []; + $this->setupContainerForAddons(); $this->setupLogChannel($this->determineLogChannel($argv)); From 5a40fdd7e1dc5fce26511afd7101ed17074c43be Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 13:53:30 +0000 Subject: [PATCH 19/31] Call App::load() on App::processConsole() and procesEjabberd() --- bin/auth_ejabberd.php | 2 +- src/App.php | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php index bc976e61a4..595ccf204a 100755 --- a/bin/auth_ejabberd.php +++ b/bin/auth_ejabberd.php @@ -52,4 +52,4 @@ $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $app = \Friendica\App::fromContainer($container); -$app->processEjabberd(); +$app->processEjabberd($_SERVER); diff --git a/src/App.php b/src/App.php index 6bdb20d45c..d622eacbb5 100644 --- a/src/App.php +++ b/src/App.php @@ -194,12 +194,22 @@ class App $this->registerErrorHandler(); + $this->load( + $serverParams, + $this->container->create(DbaDefinition::class), + $this->container->create(ViewDefinition::class), + $this->container->create(Mode::class), + $this->container->create(IManageConfigValues::class), + $this->container->create(Profiler::class), + $this->container->create(AppHelper::class), + ); + $this->registerTemplateEngine(); (\Friendica\Core\Console::create($this->container, $argv))->execute(); } - public function processEjabberd(): void + public function processEjabberd(array $serverParams): void { $this->setupContainerForAddons(); @@ -209,6 +219,16 @@ class App $this->registerErrorHandler(); + $this->load( + $serverParams, + $this->container->create(DbaDefinition::class), + $this->container->create(ViewDefinition::class), + $this->container->create(Mode::class), + $this->container->create(IManageConfigValues::class), + $this->container->create(Profiler::class), + $this->container->create(AppHelper::class), + ); + /** @var BasePath */ $basePath = $this->container->create(BasePath::class); From ed184ab52091ece1d77f2f61fb4d6e8b09640bce Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 13:58:50 +0000 Subject: [PATCH 20/31] Revert "Inject Mode into App::runFrontend() via parameter" This reverts commit 52c6f93c9adc497decc7abf75b17ecf345b279da. --- src/App.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/App.php b/src/App.php index d622eacbb5..564da764f9 100644 --- a/src/App.php +++ b/src/App.php @@ -171,7 +171,6 @@ class App $this->registerTemplateEngine(); $this->runFrontend( - $this->mode, $this->container->create(IManagePersonalConfigValues::class), $this->container->create(Page::class), $this->container->create(Nav::class), @@ -374,7 +373,6 @@ class App * @throws \ImagickException */ private function runFrontend( - Mode $mode, IManagePersonalConfigValues $pconfig, Page $page, Nav $nav, @@ -382,7 +380,7 @@ class App float $start_time, ServerRequestInterface $request ) { - $mode->setExecutor(Mode::INDEX); + $this->mode->setExecutor(Mode::INDEX); $httpInput = new HTTPInputData($request->getServerParams()); $serverVars = $request->getServerParams(); @@ -401,11 +399,11 @@ class App try { // Missing DB connection: ERROR - if ($mode->has(Mode::LOCALCONFIGPRESENT) && !$mode->has(Mode::DBAVAILABLE)) { + if ($this->mode->has(Mode::LOCALCONFIGPRESENT) && !$this->mode->has(Mode::DBAVAILABLE)) { throw new HTTPException\InternalServerErrorException($this->l10n->t('Apologies but the website is unavailable at the moment.')); } - if (!$mode->isInstall()) { + if (!$this->mode->isInstall()) { // Force SSL redirection if ($this->config->get('system', 'force_ssl') && (empty($serverVars['HTTPS']) || $serverVars['HTTPS'] === 'off') && @@ -419,7 +417,7 @@ class App DID::routeRequest($this->args->getCommand(), $serverVars); - if ($mode->isNormal() && !$mode->isBackend()) { + if ($this->mode->isNormal() && !$this->mode->isBackend()) { $requester = HTTPSignature::getSigner('', $serverVars); if (!empty($requester)) { OpenWebAuth::addVisitorCookieForHandle($requester); @@ -427,7 +425,7 @@ class App } // ZRL - if (!empty($queryVars['zrl']) && $mode->isNormal() && !$mode->isBackend() && !$this->session->getLocalUserId()) { + if (!empty($queryVars['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !$this->session->getLocalUserId()) { // Only continue when the given profile link seems valid. // Valid profile links contain a path with "/profile/" and no query parameters if ((parse_url($queryVars['zrl'], PHP_URL_QUERY) == '') && @@ -442,12 +440,12 @@ class App } } - if (!empty($queryVars['owt']) && $mode->isNormal()) { + if (!empty($queryVars['owt']) && $this->mode->isNormal()) { $token = $queryVars['owt']; OpenWebAuth::init($token); } - if (!$mode->isBackend()) { + if (!$this->mode->isBackend()) { $this->auth->withSession(); } @@ -463,7 +461,7 @@ class App // in install mode, any url loads install module // but we need "view" module for stylesheet - if ($mode->isInstall() && $moduleName !== 'install') { + if ($this->mode->isInstall() && $moduleName !== 'install') { $this->baseURL->redirect('install'); } else { Core\Update::check($this->appHelper->getBasePath(), false); @@ -513,7 +511,7 @@ class App $page['page_title'] = $moduleName; // The "view" module is required to show the theme CSS - if (!$mode->isInstall() && !$mode->has(Mode::MAINTENANCEDISABLED) && $moduleName !== 'view') { + if (!$this->mode->isInstall() && !$this->mode->has(Mode::MAINTENANCEDISABLED) && $moduleName !== 'view') { $module = $this->createModuleInstance(Maintenance::class); } else { // determine the module class and save it to the module instance @@ -535,7 +533,7 @@ class App // Wrapping HTML responses in the theme template if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) { - $response = $page->run($this->appHelper, $this->session, $this->baseURL, $this->args, $mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); + $response = $page->run($this->appHelper, $this->session, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); } $this->logger->debug('Request processed sucessfully', ['response' => $response->getStatusCode(), 'address' => $serverVars['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $serverVars['HTTP_REFERER'] ?? '', 'user-agent' => $serverVars['HTTP_USER_AGENT'] ?? '', 'duration' => number_format(microtime(true) - $request_start, 3)]); From a6c1b2eaf3459b55cb7e477da6e6b7543a62e9fe Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 14:59:01 +0000 Subject: [PATCH 21/31] Change BC promise to 5 months, fix some wording --- doc/Developers-Intro.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index f07b711648..99e84739d0 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -164,7 +164,7 @@ If you are interested in improving those clients, please contact the developers Friendica can be extended by addons. These addons relies on many classes and conventions from Friendica. As developers our work on Friendica should not break things in the addons without giving the addon maintainers a chance to fix their addons. -Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. +Our goal is to build trust for the addon maintainers but also allow Friendica developers to move on. This is called the Backward Compatibility Promise. Inspired by the [Symonfy BC promise](https://symfony.com/doc/current/contributing/code/bc.html) we promise BC for every class, interface, trait, enum, function, constant, etc., but with the exception of: @@ -208,12 +208,12 @@ As long as the code that is labeled with `@deprecated` is used inside Friendica If the deprecated code is no longer used inside Friendica or the official addons it MUST be hard deprecated. The code MUST NOT be deleted. -Starting from the next release, it MUST be stay for at least 6 months. -Hard deprecated code COULD remain longer than 6 months, depending on when a release appears. -Addon developer MUST NOT consider that they have more than 6 months to adjust their code. +Starting from the next release, it MUST be stay for at least 5 months. +Hard deprecated code COULD remain longer than 5 months, depending on when a release appears. +Addon developer MUST NOT consider that they have more than 5 months to adjust their code. Hard deprecation code means that the code triggers an `E_USER_DEPRECATION` error if it is called. -For instance with the deprecated class `Friendica\Core\Logger` the call of every method should be trigger an error: +For instance with the deprecated class `Friendica\Core\Logger` the call of every method should trigger an error: ```php /** @@ -224,7 +224,7 @@ For instance with the deprecated class `Friendica\Core\Logger` the call of every class Logger { public static function info(string $message, array $context = []) { - trigger_error('Class `' . __CLASS__ . '` is deprecated since 2025.05 and will be removed after 6 months, use constructor injection or `DI::logger()` instead.', E_USER_DEPRECATED); + trigger_error('Class `' . __CLASS__ . '` is deprecated since 2025.05 and will be removed after 5 months, use constructor injection or `DI::logger()` instead.', E_USER_DEPRECATED); self::getInstance()->info($message, $context); } @@ -234,19 +234,19 @@ class Logger { ``` This way the maintainer or users of addons will be notified that the addon will stop working in one of the next releases. -The addon maintainer now has at least 6 months to fix the deprecations. +The addon maintainer now has at least 5 months or at least one release to fix the deprecations. Please note that the deprecation message contains the release that will be released next. -In the example the code was hard deprecated in `2025.05` and COULD be removed earliest with the `2025.11` release. +In the example the code was hard deprecated with release `2025.05`, so it COULD be removed earliest with the `2025.11` release. **3. Code Removing** -We promise BC for deprecated code for at least 6 months, starting from the release the deprecation was announced. +We promise BC for deprecated code for at least 5 months, starting from the release the deprecation was announced. After this time the deprecated code COULD be remove within the next release. Breaking changes MUST be happen only in a new release but MUST be hard deprecated first. The BC promise refers only to releases, respective the `stable` branch. Deprecated code on other branches like `develop` or RC branches could be removed earlier. -This is not a BC break as long as the release is published 6 months after the deprecation. +This is not a BC break as long as the release will be published 5 months after the hard deprecation. -If a release breaks BC without deprecation or earlier than 6 months, this SHOULD considered as a bug and BC SHOULD be restored in a bugfix release. +If a release breaks BC without deprecation or earlier than 5 months, this SHOULD considered as a bug and BC SHOULD be restored in a bugfix release. From 92aabbdcecea8a16b342e554ab2a7ba44587b2ef Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 15:24:32 +0000 Subject: [PATCH 22/31] Mark App as final and internal --- src/App.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/App.php b/src/App.php index 73f2913b1a..b756a847d9 100644 --- a/src/App.php +++ b/src/App.php @@ -57,6 +57,7 @@ use Psr\Log\LoggerInterface; * and anything else that might need to be passed around * before we spit the page out. * + * @final */ class App { @@ -64,6 +65,9 @@ class App const CODENAME = 'Interrupted Fern'; const VERSION = '2025.02-dev'; + /** + * @internal + */ public static function fromContainer(Container $container): self { return new self($container); @@ -130,6 +134,9 @@ class App $this->container = $container; } + /** + * @internal + */ public function processRequest(ServerRequestInterface $request, float $start_time): void { $this->container->addRule(Mode::class, [ @@ -178,6 +185,9 @@ class App ); } + /** + * @internal + */ public function processConsole(array $argv): void { $this->setupContainerForAddons(); @@ -193,6 +203,9 @@ class App (\Friendica\Core\Console::create($this->container, $argv))->execute(); } + /** + * @internal + */ public function processEjabberd(): void { $this->setupContainerForAddons(); From 700cedd69b8779287a8f665f687f1869f653718b Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 15:31:11 +0000 Subject: [PATCH 23/31] Mark DI::getDice() as internal --- src/DI.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DI.php b/src/DI.php index 7d1114ac5c..c9c973f722 100644 --- a/src/DI.php +++ b/src/DI.php @@ -60,7 +60,8 @@ abstract class DI /** * Returns a clone of the current dice instance - * This useful for overloading the current instance with mocked methods during tests + * + * @internal This useful for overloading the current instance with mocked methods during tests * * @return Dice */ From 69830b9c03113702f7e061ece21781694c63c6b6 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 15:43:26 +0000 Subject: [PATCH 24/31] Move deprecation message into bin-files --- bin/daemon.php | 4 +++- bin/jetstream.php | 4 +++- bin/worker.php | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/daemon.php b/bin/daemon.php index 546f207e08..c3d945d941 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later * - * @deprecated 2025.02 use bin/console.php daemon instead + * @deprecated 2025.02 use `bin/console.php daemon` instead */ /** @@ -24,6 +24,8 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; +fwrite(STDOUT, '`bin/daemon.php` is deprecated since 2024.02 and will be removed in 5 months, please use `bin/console.php daemon` instead.' . \PHP_EOL); + $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "daemon"); diff --git a/bin/jetstream.php b/bin/jetstream.php index 156f961856..2aa1886c6e 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later * - * @deprecated 2025.02 use bin/console.php jetstream instead + * @deprecated 2025.02 use `bin/console.php jetstream` instead */ if (php_sapi_name() !== 'cli') { @@ -19,6 +19,8 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; +fwrite(STDOUT, '`bin/jetstream.php` is deprecated since 2024.02 and will be removed in 5 months, please use `bin/console.php jetstream` instead.' . \PHP_EOL); + $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "jetstream"); diff --git a/bin/worker.php b/bin/worker.php index a79d8836a7..f099bc8e66 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -8,7 +8,7 @@ * * Starts the background processing * - * @deprecated 2025.02 use bin/console.php worker instead + * @deprecated 2025.02 use `bin/console.php worker` instead */ if (php_sapi_name() !== 'cli') { @@ -21,6 +21,8 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; +fwrite(STDOUT, '`bin/worker.php` is deprecated since 2024.02 and will be removed in 5 months, please use `bin/console.php worker` instead.' . \PHP_EOL); + $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "worker"); From 23fcb4f87fd87b29c9585ce5699bdd93cfbabfc7 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 15:47:49 +0000 Subject: [PATCH 25/31] Dont show deprecation message twice --- src/Console/Daemon.php | 5 ++--- src/Console/JetstreamDaemon.php | 5 ++--- src/Console/Worker.php | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Console/Daemon.php b/src/Console/Daemon.php index c8165a1d9b..f115ec0b66 100644 --- a/src/Console/Daemon.php +++ b/src/Console/Daemon.php @@ -10,6 +10,7 @@ declare(strict_types=1); namespace Friendica\Console; use Asika\SimpleConsole\CommandArgsException; +use Asika\SimpleConsole\Console; use Friendica\App\Mode; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; @@ -27,7 +28,7 @@ use RuntimeException; /** * Console command for interacting with the daemon */ -final class Daemon extends AbstractConsole +final class Daemon extends Console { public const LOG_CHANNEL = LogChannel::DAEMON; @@ -93,8 +94,6 @@ HELP; protected function doExecute() { - $this->checkDeprecated('daemon'); - if ($this->mode->isInstall()) { throw new RuntimeException("Friendica isn't properly installed yet"); } diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php index d34e5780c2..6071e01f49 100644 --- a/src/Console/JetstreamDaemon.php +++ b/src/Console/JetstreamDaemon.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace Friendica\Console; +use Asika\SimpleConsole\Console; use Friendica\App\Mode; use Friendica\Core\Addon; use Friendica\Core\Config\Capability\IManageConfigValues; @@ -22,7 +23,7 @@ use RuntimeException; /** * Console command for interacting with the daemon */ -final class JetstreamDaemon extends AbstractConsole +final class JetstreamDaemon extends Console { public const LOG_CHANNEL = LogChannel::DAEMON; @@ -79,8 +80,6 @@ HELP; protected function doExecute() { - $this->checkDeprecated('jetstream'); - if ($this->mode->isInstall()) { throw new RuntimeException("Friendica isn't properly installed yet"); } diff --git a/src/Console/Worker.php b/src/Console/Worker.php index 1c7eeae002..41de4f1764 100644 --- a/src/Console/Worker.php +++ b/src/Console/Worker.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace Friendica\Console; +use Asika\SimpleConsole\Console; use Friendica\App\Mode; use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Core\Update; @@ -19,7 +20,7 @@ use Friendica\Util\BasePath; /** * Console command for starting worker */ -final class Worker extends AbstractConsole +final class Worker extends Console { public const LOG_CHANNEL = LogChannel::WORKER; @@ -69,8 +70,6 @@ HELP; protected function doExecute() { - $this->checkDeprecated('worker'); - $this->mode->setExecutor(Mode::WORKER); // Check the database structure and possibly fixes it From 65b79b5ea0365ade02886c7aa171cfc24a821102 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 15:57:21 +0000 Subject: [PATCH 26/31] Remove unused AbstractConsole --- src/Console/AbstractConsole.php | 39 --------------------------------- src/Console/Daemon.php | 3 --- src/Console/JetstreamDaemon.php | 3 --- src/Console/Worker.php | 3 --- 4 files changed, 48 deletions(-) delete mode 100644 src/Console/AbstractConsole.php diff --git a/src/Console/AbstractConsole.php b/src/Console/AbstractConsole.php deleted file mode 100644 index 0b8c1d6eb8..0000000000 --- a/src/Console/AbstractConsole.php +++ /dev/null @@ -1,39 +0,0 @@ -executable, -strlen(CoreConsole::getDefaultExecutable())) !== CoreConsole::getDefaultExecutable()) { - $this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php %s' instead", $this->executable, $command)); - } - } -} diff --git a/src/Console/Daemon.php b/src/Console/Daemon.php index f115ec0b66..a21ff26fc6 100644 --- a/src/Console/Daemon.php +++ b/src/Console/Daemon.php @@ -14,7 +14,6 @@ use Asika\SimpleConsole\Console; use Friendica\App\Mode; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; -use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Core\System; use Friendica\Core\Update; use Friendica\Core\Worker; @@ -30,8 +29,6 @@ use RuntimeException; */ final class Daemon extends Console { - public const LOG_CHANNEL = LogChannel::DAEMON; - private Mode $mode; private IManageConfigValues $config; private IManageKeyValuePairs $keyValue; diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php index 6071e01f49..8bb1e7e106 100644 --- a/src/Console/JetstreamDaemon.php +++ b/src/Console/JetstreamDaemon.php @@ -15,7 +15,6 @@ use Friendica\Core\Addon; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; -use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Protocol\ATProtocol\Jetstream; use Friendica\System\Daemon as SysDaemon; use RuntimeException; @@ -25,8 +24,6 @@ use RuntimeException; */ final class JetstreamDaemon extends Console { - public const LOG_CHANNEL = LogChannel::DAEMON; - private Mode $mode; private IManageConfigValues $config; private IManageKeyValuePairs $keyValue; diff --git a/src/Console/Worker.php b/src/Console/Worker.php index 41de4f1764..97b7160d03 100644 --- a/src/Console/Worker.php +++ b/src/Console/Worker.php @@ -11,7 +11,6 @@ namespace Friendica\Console; use Asika\SimpleConsole\Console; use Friendica\App\Mode; -use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Core\Update; use Friendica\Core\Worker as CoreWorker; use Friendica\Core\Worker\Repository\Process as ProcessRepository; @@ -22,8 +21,6 @@ use Friendica\Util\BasePath; */ final class Worker extends Console { - public const LOG_CHANNEL = LogChannel::WORKER; - private Mode $mode; private BasePath $basePath; private ProcessRepository $processRepo; From 0b84cf401daf73d4fff52e0f1d2287be10b8f591 Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 22 Jan 2025 19:52:48 +0000 Subject: [PATCH 27/31] Mark more new classes as internal --- src/AppLegacy.php | 1 + src/Core/Container.php | 2 ++ src/Core/DiceContainer.php | 2 ++ src/Core/Logger/Factory/LegacyLoggerFactory.php | 2 ++ src/Core/Logger/LoggerManager.php | 2 ++ 5 files changed, 9 insertions(+) diff --git a/src/AppLegacy.php b/src/AppLegacy.php index 4aa3f25e4c..8ec6b0aabc 100644 --- a/src/AppLegacy.php +++ b/src/AppLegacy.php @@ -32,6 +32,7 @@ use Friendica\Util\Strings; * and anything else that might need to be passed around * before we spit the page out. * + * @internal */ final class AppLegacy implements AppHelper { diff --git a/src/Core/Container.php b/src/Core/Container.php index 1017590a85..55e0826122 100644 --- a/src/Core/Container.php +++ b/src/Core/Container.php @@ -11,6 +11,8 @@ namespace Friendica\Core; /** * Dependency Injection Container + * + * @internal */ interface Container { diff --git a/src/Core/DiceContainer.php b/src/Core/DiceContainer.php index 304c1e411d..bd1eaf8043 100644 --- a/src/Core/DiceContainer.php +++ b/src/Core/DiceContainer.php @@ -13,6 +13,8 @@ use Dice\Dice; /** * Wrapper for the Dice class to make some basic setups + * + * @internal */ final class DiceContainer implements Container { diff --git a/src/Core/Logger/Factory/LegacyLoggerFactory.php b/src/Core/Logger/Factory/LegacyLoggerFactory.php index 5c91d11771..2c7b6c0237 100644 --- a/src/Core/Logger/Factory/LegacyLoggerFactory.php +++ b/src/Core/Logger/Factory/LegacyLoggerFactory.php @@ -26,6 +26,8 @@ use Psr\Log\LoggerInterface; * * @see \Friendica\Core\Logger\Factory\StreamLogger * @see \Friendica\Core\Logger\Factory\SyslogLogger + * + * @internal */ final class LegacyLoggerFactory implements LoggerFactory { diff --git a/src/Core/Logger/LoggerManager.php b/src/Core/Logger/LoggerManager.php index 697756099d..8379c91995 100644 --- a/src/Core/Logger/LoggerManager.php +++ b/src/Core/Logger/LoggerManager.php @@ -21,6 +21,8 @@ use Psr\Log\NullLogger; /** * Manager for the core logging instances + * + * @internal */ final class LoggerManager { From bccf95a088838975295b7411508a6b0c8ce8d480 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 22 Jan 2025 20:26:05 +0000 Subject: [PATCH 28/31] Changes after review --- src/Util/HTTPSignature.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index b4ecf32eb6..ebaeab028c 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -604,14 +604,14 @@ class HTTPSignature /** * Gets a signer from a given HTTP request * - * @param string $content - * @param array $http_headers + * @param string $content Body of the request + * @param array $http_headers array containing the HTTP headers * @param ?boolean $update true = always update, false = never update, null = update when not found or outdated * * @return string|null|false Signer * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function getSigner(string $content, array $http_headers, bool $update = null) + public static function getSigner(string $content, array $http_headers, ?bool $update = null) { if (empty($http_headers['HTTP_SIGNATURE'])) { DI::logger()->debug('No HTTP_SIGNATURE header'); @@ -803,14 +803,14 @@ class HTTPSignature /** * fetches a key for a given id and actor * - * @param string $id - * @param string $actor + * @param string $id keyId of the signature block + * @param string $actor Actor URI * @param ?boolean $update true = always update, false = never update, null = update when not found or outdated * * @return array with actor url and public key * @throws \Exception */ - private static function fetchKey(string $id, string $actor, bool $update = null): array + private static function fetchKey(string $id, string $actor, ?bool $update = null): array { $url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id); From 0f8786f8b18be97f1c7a92f5e72fcc7b5fcb1968 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 22 Jan 2025 20:31:14 +0000 Subject: [PATCH 29/31] Fix codestyle --- src/Util/HTTPSignature.php | 50 +++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index ebaeab028c..bb5d8c6b5a 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -49,19 +49,21 @@ class HTTPSignature { $headers = null; $spoofable = false; - $result = [ - 'signer' => '', - 'header_signed' => false, - 'header_valid' => false + $result = [ + 'signer' => '', + 'header_signed' => false, + 'header_valid' => false ]; // Decide if $data arrived via controller submission or curl. $headers = []; + $headers['(request-target)'] = strtolower(DI::args()->getMethod()) . ' ' . $_SERVER['REQUEST_URI']; foreach ($_SERVER as $k => $v) { if (strpos($k, 'HTTP_') === 0) { $field = str_replace('_', '-', strtolower(substr($k, 5))); + $headers[$field] = $v; } } @@ -98,6 +100,7 @@ class HTTPSignature if ($key && function_exists($key)) { $result['signer'] = $sig_block['keyId']; + $key = $key($sig_block['keyId']); } @@ -136,7 +139,7 @@ class HTTPSignature $return_headers = $head; } - $alg = 'sha512'; + $alg = 'sha512'; $algorithm = 'rsa-sha512'; $x = self::sign($head, $prvkey, $alg); @@ -158,7 +161,7 @@ class HTTPSignature */ private static function sign(array $head, string $prvkey, string $alg = 'sha256'): array { - $ret = []; + $ret = []; $headers = ''; $fields = ''; @@ -220,10 +223,10 @@ class HTTPSignature } $return = [ - 'keyId' => $headers['keyId'] ?? '', + 'keyId' => $headers['keyId'] ?? '', 'algorithm' => $headers['algorithm'] ?? 'rsa-sha256', - 'created' => $headers['created'] ?? null, - 'expires' => $headers['expires'] ?? null, + 'created' => $headers['created'] ?? null, + 'expires' => $headers['expires'] ?? null, 'headers' => explode(' ', $headers['headers'] ?? ''), 'signature' => base64_decode(preg_replace('/\s+/', '', $headers['signature'] ?? '')), ]; @@ -268,17 +271,17 @@ class HTTPSignature $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); // Header data that is about to be signed. - $host = strtolower(parse_url($target, PHP_URL_HOST)); - $path = parse_url($target, PHP_URL_PATH); - $digest = 'SHA-256=' . base64_encode(hash('sha256', $content, true)); + $host = strtolower(parse_url($target, PHP_URL_HOST)); + $path = parse_url($target, PHP_URL_PATH); + $digest = 'SHA-256=' . base64_encode(hash('sha256', $content, true)); $content_length = strlen($content); - $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP); + $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP); $headers = [ - 'Date' => $date, + 'Date' => $date, 'Content-Length' => $content_length, - 'Digest' => $digest, - 'Host' => $host + 'Digest' => $digest, + 'Host' => $host ]; $signed_data = "(request-target): post " . $path . "\ndate: " . $date . "\ncontent-length: " . $content_length . "\ndigest: " . $digest . "\nhost: " . $host; @@ -289,7 +292,7 @@ class HTTPSignature $headers['Content-Type'] = 'application/activity+json'; - $postResult = DI::httpClient()->post($target, $content, $headers, DI::config()->get('system', 'curl_timeout'), HttpClientRequest::ACTIVITYPUB); + $postResult = DI::httpClient()->post($target, $content, $headers, DI::config()->get('system', 'curl_timeout'), HttpClientRequest::ACTIVITYPUB); $return_code = $postResult->getReturnCode(); DI::logger()->info('Transmit to ' . $target . ' returned ' . $return_code); @@ -318,10 +321,10 @@ class HTTPSignature return false; } - $activity = JsonLD::compact($data); - $type = JsonLD::fetchElement($activity, '@type'); + $activity = JsonLD::compact($data); + $type = JsonLD::fetchElement($activity, '@type'); $trust_source = true; - $object_data = Receiver::prepareObjectData($activity, $uid, true, $trust_source, $owner['url']); + $object_data = Receiver::prepareObjectData($activity, $uid, true, $trust_source, $owner['url']); if (empty($object_data)) { return false; } @@ -387,7 +390,7 @@ class HTTPSignature * @param int $gsid Server ID * @throws \Exception */ - static public function setInboxStatus(string $url, bool $success, bool $shared = false, int $gsid = null) + public static function setInboxStatus(string $url, bool $success, bool $shared = false, int $gsid = null) { $now = DateTimeFormat::utcNow(); @@ -434,7 +437,7 @@ class HTTPSignature $stamp1 = strtotime($status['success']); } - $stamp2 = strtotime($now); + $stamp2 = strtotime($now); $previous_stamp = strtotime($status['previous']); // Archive the inbox when there had been failures for five days. @@ -631,11 +634,13 @@ class HTTPSignature } $headers = []; + $headers['(request-target)'] = strtolower(DI::args()->getMethod()) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH); // First take every header foreach ($http_headers as $k => $v) { $field = str_replace('_', '-', strtolower($k)); + $headers[$field] = $v; } @@ -643,6 +648,7 @@ class HTTPSignature foreach ($http_headers as $k => $v) { if (strpos($k, 'HTTP_') === 0) { $field = str_replace('_', '-', strtolower(substr($k, 5))); + $headers[$field] = $v; } } From d74ca3ecf565f1c58112b508adf3514fcedeb286 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 22 Jan 2025 20:56:21 +0000 Subject: [PATCH 30/31] Fix codestyle --- src/Model/Contact.php | 202 +++++++-------- src/Model/GServer.php | 231 +++++++++-------- src/Module/Admin/Site.php | 495 ++++++++++++++++++------------------- static/settings.config.php | 2 +- 4 files changed, 476 insertions(+), 454 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7cac007a64..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,9 +353,9 @@ 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)) { @@ -846,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; } @@ -877,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]); @@ -906,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; @@ -1092,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; @@ -1144,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); @@ -1158,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; @@ -1214,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'; @@ -1376,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']); @@ -1411,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]; @@ -1634,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); @@ -1697,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 = ''; } @@ -1713,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()]); @@ -1722,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); @@ -1913,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; @@ -1971,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 = ''; @@ -2016,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; } @@ -2036,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; } @@ -2153,7 +2153,7 @@ class Contact return DI::baseUrl() . $default; } - $avatar['url'] = ''; + $avatar['url'] = ''; $avatar['success'] = false; Hook::callAll('avatar_lookup', $avatar); @@ -2181,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); @@ -2249,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); @@ -2380,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]); } @@ -2423,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; @@ -2480,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']); @@ -2607,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; } @@ -2622,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)) { @@ -2693,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; @@ -2890,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']; } } @@ -2914,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']; @@ -2981,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; } @@ -3113,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) { @@ -3131,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']); @@ -3210,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'], @@ -3230,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) { @@ -3275,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 @@ -3287,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 @@ -3368,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)) { @@ -3402,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; } @@ -3507,7 +3507,7 @@ class Contact DBA::update( 'contact', ['bdyear' => substr($nextbd, 0, 4), 'bd' => $nextbd], - ['id' => $contact['id']] + ['id' => $contact['id']] ); } } @@ -3662,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; } @@ -3682,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; } @@ -3713,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) { @@ -3762,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 ee9661b796..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; } @@ -2497,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']]); @@ -2537,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); @@ -2554,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 e56e45f0a5..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,81 +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); - $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); + $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); @@ -141,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']) : ''); @@ -160,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(); @@ -174,24 +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', '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); + $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'); @@ -236,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) { @@ -316,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(); @@ -359,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'); @@ -399,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]); @@ -423,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'), @@ -469,119 +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.') . '
      ' . + '$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.') . '
        ' . '
      • ' . DI::l10n()->t('None - deactivated') . '
        • ' . '
      • ' . DI::l10n()->t('Local contacts - contacts of our local contacts are discovered for their followers/followings.') . '
        • ' . '
      • ' . DI::l10n()->t('Interactors - contacts of our local contacts and contacts who interacted on locally visible postings are discovered for their followers/followings.') . '
      ', $discovery_choices], - '$update_active_contacts' => ['update_active_contacts', DI::l10n()->t('Only update contacts/servers with local data'), DI::config()->get('system', 'update_active_contacts'), DI::l10n()->t('If enabled, the system will only look for changes in contacts and servers that engaged on this system by either being in a contact list of a user or when posts or comments exists from the contact on this system.')], - '$update_known_contacts' => ['update_known_contacts', DI::l10n()->t('Only update contacts with relations'), DI::config()->get('system', 'update_known_contacts'), DI::l10n()->t('If enabled, the system will only look for changes in contacts that are in a contact list of a user on this system.')], + '$update_active_contacts' => ['update_active_contacts', DI::l10n()->t('Only update contacts/servers with local data'), DI::config()->get('system', 'update_active_contacts'), DI::l10n()->t('If enabled, the system will only look for changes in contacts and servers that engaged on this system by either being in a contact list of a user or when posts or comments exists from the contact on this system.')], + '$update_known_contacts' => ['update_known_contacts', DI::l10n()->t('Only update contacts with relations'), DI::config()->get('system', 'update_known_contacts'), DI::l10n()->t('If enabled, the system will only look for changes in contacts that are in a contact list of a user on this system.')], '$synchronize_directory' => ['synchronize_directory', DI::l10n()->t('Synchronize the contacts with the directory server'), DI::config()->get('system', 'synchronize_directory'), DI::l10n()->t('if enabled, the system will check periodically for new contacts on the defined directory server.')], - '$poco_discovery' => ['poco_discovery', DI::l10n()->t('Discover contacts from other servers'), DI::config()->get('system', 'poco_discovery'), DI::l10n()->t('Periodically query other servers for contacts and servers that they know of. The system queries Friendica, Mastodon and Hubzilla servers. Keep it deactivated on small machines to decrease the database size and load.')], - '$poco_requery_days' => ['poco_requery_days', DI::l10n()->t('Days between requery'), DI::config()->get('system', 'poco_requery_days'), DI::l10n()->t('Number of days after which a server is requeried for their contacts and servers it knows of. This is only used when the discovery is activated.')], - '$poco_local_search' => ['poco_local_search', DI::l10n()->t('Search the local directory'), DI::config()->get('system', 'poco_local_search'), DI::l10n()->t('Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.')], + '$poco_discovery' => ['poco_discovery', DI::l10n()->t('Discover contacts from other servers'), DI::config()->get('system', 'poco_discovery'), DI::l10n()->t('Periodically query other servers for contacts and servers that they know of. The system queries Friendica, Mastodon and Hubzilla servers. Keep it deactivated on small machines to decrease the database size and load.')], + '$poco_requery_days' => ['poco_requery_days', DI::l10n()->t('Days between requery'), DI::config()->get('system', 'poco_requery_days'), DI::l10n()->t('Number of days after which a server is requeried for their contacts and servers it knows of. This is only used when the discovery is activated.')], + '$poco_local_search' => ['poco_local_search', DI::l10n()->t('Search the local directory'), DI::config()->get('system', 'poco_local_search'), DI::l10n()->t('Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.')], - '$nodeinfo' => ['nodeinfo', DI::l10n()->t('Publish server information'), DI::config()->get('system', 'nodeinfo'), DI::l10n()->t('If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.')], + '$nodeinfo' => ['nodeinfo', DI::l10n()->t('Publish server information'), DI::config()->get('system', 'nodeinfo'), DI::l10n()->t('If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.')], - '$check_new_version_url' => ['check_new_version_url', DI::l10n()->t('Check upstream version'), DI::config()->get('system', 'check_new_version_url'), DI::l10n()->t('Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview.'), $check_git_version_choices], - '$suppress_tags' => ['suppress_tags', DI::l10n()->t('Suppress Tags'), DI::config()->get('system', 'suppress_tags'), DI::l10n()->t('Suppress showing a list of hashtags at the end of the posting.')], - '$dbclean' => ['dbclean', DI::l10n()->t('Clean database'), DI::config()->get('system', 'dbclean'), DI::l10n()->t('Remove old remote items, orphaned database records and old content from some other helper tables.')], - '$dbclean_expire_days' => ['dbclean_expire_days', DI::l10n()->t('Lifespan of remote items'), DI::config()->get('system', 'dbclean-expire-days'), DI::l10n()->t('When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.')], - '$dbclean_unclaimed' => ['dbclean_unclaimed', DI::l10n()->t('Lifespan of unclaimed items'), DI::config()->get('system', 'dbclean-expire-unclaimed'), DI::l10n()->t('When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.')], - '$dbclean_expire_conv' => ['dbclean_expire_conv', DI::l10n()->t('Lifespan of raw conversation data'), DI::config()->get('system', 'dbclean_expire_conversation'), DI::l10n()->t('The conversation data is used for ActivityPub, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.')], - '$max_comments' => ['max_comments', DI::l10n()->t('Maximum numbers of comments per post'), DI::config()->get('system', 'max_comments'), DI::l10n()->t('How much comments should be shown for each post? Default value is 100.')], - '$max_display_comments' => ['max_display_comments', DI::l10n()->t('Maximum numbers of comments per post on the display page'), DI::config()->get('system', 'max_display_comments'), DI::l10n()->t('How many comments should be shown on the single view for each post? Default value is 1000.')], - '$itemspage_network' => ['itemspage_network', DI::l10n()->t('Items per page'), DI::config()->get('system', 'itemspage_network'), DI::l10n()->t('Number of items per page in stream pages (network, community, profile/contact statuses, search).')], + '$check_new_version_url' => ['check_new_version_url', DI::l10n()->t('Check upstream version'), DI::config()->get('system', 'check_new_version_url'), DI::l10n()->t('Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview.'), $check_git_version_choices], + '$suppress_tags' => ['suppress_tags', DI::l10n()->t('Suppress Tags'), DI::config()->get('system', 'suppress_tags'), DI::l10n()->t('Suppress showing a list of hashtags at the end of the posting.')], + '$dbclean' => ['dbclean', DI::l10n()->t('Clean database'), DI::config()->get('system', 'dbclean'), DI::l10n()->t('Remove old remote items, orphaned database records and old content from some other helper tables.')], + '$dbclean_expire_days' => ['dbclean_expire_days', DI::l10n()->t('Lifespan of remote items'), DI::config()->get('system', 'dbclean-expire-days'), DI::l10n()->t('When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.')], + '$dbclean_unclaimed' => ['dbclean_unclaimed', DI::l10n()->t('Lifespan of unclaimed items'), DI::config()->get('system', 'dbclean-expire-unclaimed'), DI::l10n()->t('When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.')], + '$dbclean_expire_conv' => ['dbclean_expire_conv', DI::l10n()->t('Lifespan of raw conversation data'), DI::config()->get('system', 'dbclean_expire_conversation'), DI::l10n()->t('The conversation data is used for ActivityPub, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.')], + '$max_comments' => ['max_comments', DI::l10n()->t('Maximum numbers of comments per post'), DI::config()->get('system', 'max_comments'), DI::l10n()->t('How much comments should be shown for each post? Default value is 100.')], + '$max_display_comments' => ['max_display_comments', DI::l10n()->t('Maximum numbers of comments per post on the display page'), DI::config()->get('system', 'max_display_comments'), DI::l10n()->t('How many comments should be shown on the single view for each post? Default value is 1000.')], + '$itemspage_network' => ['itemspage_network', DI::l10n()->t('Items per page'), DI::config()->get('system', 'itemspage_network'), DI::l10n()->t('Number of items per page in stream pages (network, community, profile/contact statuses, search).')], '$itemspage_network_mobile' => ['itemspage_network_mobile', DI::l10n()->t('Items per page for mobile devices'), DI::config()->get('system', 'itemspage_network_mobile'), DI::l10n()->t('Number of items per page in stream pages (network, community, profile/contact statuses, search) for mobile devices.')], - '$temppath' => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')], - '$only_tag_search' => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')], - '$limited_search_scope' => ['limited_search_scope', DI::l10n()->t('Limited search scope'), DI::config()->get('system', 'limited_search_scope'), DI::l10n()->t('If enabled, searches will only be performed in the data used for the channels and not in all posts.')], - '$search_age_days' => ['search_age_days', DI::l10n()->t('Maximum age of items in the search table'), DI::config()->get('system', 'search_age_days'), DI::l10n()->t('Maximum age of items in the search table in days. Lower values will increase the performance and reduce disk usage. 0 means no age restriction.')], - '$compute_circle_counts' => ['compute_circle_counts', DI::l10n()->t('Generate counts per contact circle when calculating network count'), DI::config()->get('system', 'compute_circle_counts'), DI::l10n()->t('On systems with users that heavily use contact circles the query can be very expensive.')], - '$process_view' => ['process_view', DI::l10n()->t('Process "view" activities'), DI::config()->get('system', 'process_view'), DI::l10n()->t('"view" activities are mostly geberated by Peertube systems. Per default they are not processed for performance reasons. Only activate this option on performant system.')], - '$archival_days' => ['archival_days', DI::l10n()->t('Days, after which a contact is archived'), DI::config()->get('system', 'archival_days'), DI::l10n()->t('Number of days that we try to deliver content or to update the contact data before we archive a contact.')], + '$temppath' => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')], + '$only_tag_search' => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')], + '$limited_search_scope' => ['limited_search_scope', DI::l10n()->t('Limited search scope'), DI::config()->get('system', 'limited_search_scope'), DI::l10n()->t('If enabled, searches will only be performed in the data used for the channels and not in all posts.')], + '$search_age_days' => ['search_age_days', DI::l10n()->t('Maximum age of items in the search table'), DI::config()->get('system', 'search_age_days'), DI::l10n()->t('Maximum age of items in the search table in days. Lower values will increase the performance and reduce disk usage. 0 means no age restriction.')], + '$compute_circle_counts' => ['compute_circle_counts', DI::l10n()->t('Generate counts per contact circle when calculating network count'), DI::config()->get('system', 'compute_circle_counts'), DI::l10n()->t('On systems with users that heavily use contact circles the query can be very expensive.')], + '$process_view' => ['process_view', DI::l10n()->t('Process "view" activities'), DI::config()->get('system', 'process_view'), DI::l10n()->t('"view" activities are mostly geberated by Peertube systems. Per default they are not processed for performance reasons. Only activate this option on performant system.')], + '$archival_days' => ['archival_days', DI::l10n()->t('Days, after which a contact is archived'), DI::config()->get('system', 'archival_days'), DI::l10n()->t('Number of days that we try to deliver content or to update the contact data before we archive a contact.')], - '$worker_queues' => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], - '$worker_load_cooldown' => ['worker_load_cooldown', DI::l10n()->t('Maximum load for workers'), DI::config()->get('system', 'worker_load_cooldown'), DI::l10n()->t('Maximum load that causes a cooldown before each worker function call.')], - '$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], - '$decoupled_receiver' => ['decoupled_receiver', DI::l10n()->t('Decoupled receiver'), DI::config()->get('system', 'decoupled_receiver'), DI::l10n()->t('Decouple incoming ActivityPub posts by processing them in the background via a worker process. Only enable this on fast systems.')], - '$cron_interval' => ['cron_interval', DI::l10n()->t('Cron interval'), DI::config()->get('system', 'cron_interval'), DI::l10n()->t('Minimal period in minutes between two calls of the "Cron" worker job.')], - '$worker_defer_limit' => ['worker_defer_limit', DI::l10n()->t('Worker defer limit'), DI::config()->get('system', 'worker_defer_limit'), DI::l10n()->t('Per default the systems tries delivering for 15 times before dropping it.')], - '$worker_fetch_limit' => ['worker_fetch_limit', DI::l10n()->t('Worker fetch limit'), DI::config()->get('system', 'worker_fetch_limit'), DI::l10n()->t('Number of worker tasks that are fetched in a single query. Higher values should increase the performance, too high values will mostly likely decrease it. Only change it, when you know how to measure the performance of your system.')], + '$worker_queues' => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], + '$worker_load_cooldown' => ['worker_load_cooldown', DI::l10n()->t('Maximum load for workers'), DI::config()->get('system', 'worker_load_cooldown'), DI::l10n()->t('Maximum load that causes a cooldown before each worker function call.')], + '$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], + '$decoupled_receiver' => ['decoupled_receiver', DI::l10n()->t('Decoupled receiver'), DI::config()->get('system', 'decoupled_receiver'), DI::l10n()->t('Decouple incoming ActivityPub posts by processing them in the background via a worker process. Only enable this on fast systems.')], + '$cron_interval' => ['cron_interval', DI::l10n()->t('Cron interval'), DI::config()->get('system', 'cron_interval'), DI::l10n()->t('Minimal period in minutes between two calls of the "Cron" worker job.')], + '$worker_defer_limit' => ['worker_defer_limit', DI::l10n()->t('Worker defer limit'), DI::config()->get('system', 'worker_defer_limit'), DI::l10n()->t('Per default the systems tries delivering for 15 times before dropping it.')], + '$worker_fetch_limit' => ['worker_fetch_limit', DI::l10n()->t('Worker fetch limit'), DI::config()->get('system', 'worker_fetch_limit'), DI::l10n()->t('Number of worker tasks that are fetched in a single query. Higher values should increase the performance, too high values will mostly likely decrease it. Only change it, when you know how to measure the performance of your system.')], '$relay_directly' => ['relay_directly', DI::l10n()->t('Direct relay transfer'), DI::config()->get('system', 'relay_directly'), DI::l10n()->t('Enables the direct transfer to other servers without using the relay servers')], '$relay_scope' => ['relay_scope', DI::l10n()->t('Relay scope'), DI::config()->get('system', 'relay_scope'), DI::l10n()->t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), [Relay::SCOPE_NONE => DI::l10n()->t('Disabled'), Relay::SCOPE_ALL => DI::l10n()->t('all'), Relay::SCOPE_TAGS => DI::l10n()->t('tags')]], @@ -599,8 +596,8 @@ class Site extends BaseAdmin '$max_posts_per_author' => ['max_posts_per_author', DI::l10n()->t('Maximum number of posts per author'), DI::config()->get('channel', 'max_posts_per_author'), DI::l10n()->t('Maximum number of posts per page by author if the contact frequency is set to "Display only few posts". If there are more posts, then the post with the most interactions will be displayed.')], '$sharer_interaction_days' => ['sharer_interaction_days', DI::l10n()->t('Sharer interaction days'), DI::config()->get('channel', 'sharer_interaction_days'), DI::l10n()->t('Number of days of the last interaction that are used to define which sharers are used for the "sharers of sharers" channel.')], - '$form_security_token' => self::getFormSecurityToken('admin_site'), - '$relocate_button' => DI::l10n()->t('Start Relocation'), + '$form_security_token' => self::getFormSecurityToken('admin_site'), + '$relocate_button' => DI::l10n()->t('Start Relocation'), ]); } } diff --git a/static/settings.config.php b/static/settings.config.php index 869065ce6e..59507690e3 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -74,7 +74,7 @@ return [ // curl_timeout (Integer) // Value is in seconds. Set to 0 for unlimited (not recommended). - 'curl_timeout' => 60, + 'curl_timeout' => 60, // dbclean (Boolean) // Remove old remote items, orphaned database records and old content from some other helper tables. From 3da2a3ef3d89340387dc8fa8943ef2894cef855c Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 22 Jan 2025 21:02:15 +0000 Subject: [PATCH 31/31] Fix logger calls --- src/Worker/UpdateContact.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php index 24c65a3d3c..6928b0c2f2 100644 --- a/src/Worker/UpdateContact.php +++ b/src/Worker/UpdateContact.php @@ -69,22 +69,22 @@ class UpdateContact } if (DI::config()->get('system', 'update_known_contacts') && ($contact['uid'] == 0) && !Contact::hasRelations($contact_id)) { - Logger::debug('No local relations, contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + DI::logger()->debug('No local relations, contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); return false; } if (DI::config()->get('system', 'update_active_contacts') && $contact['local-data']) { - Logger::debug('No local data, contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + DI::logger()->debug('No local data, contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); return false; } if (Contact::isLocal($contact['url'])) { - Logger::debug('Local contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + DI::logger()->debug('Local contact will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); return false; } if (!Protocol::supportsProbe($contact['network'])) { - Logger::debug('Contact does not support probe, it will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); + DI::logger()->debug('Contact does not support probe, it will not be updated', ['id' => $contact_id, 'url' => $contact['url'], 'network' => $contact['network']]); return false; }