diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 0ce2724447..10f32d079c 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -162,6 +162,7 @@ class Site extends BaseAdmin $disable_embedded = !empty($_POST['disable_embedded']); $allow_users_remote_self = !empty($_POST['allow_users_remote_self']); $explicit_content = !empty($_POST['explicit_content']); + $proxify_content = !empty($_POST['proxify_content']); $enable_multi_reg = !empty($_POST['enable_multi_reg']); $enable_openid = !empty($_POST['enable_openid']); @@ -328,6 +329,7 @@ class Site extends BaseAdmin DI::config()->set('system', 'disable_embedded' , $disable_embedded); DI::config()->set('system', 'allow_users_remote_self', $allow_users_remote_self); DI::config()->set('system', 'explicit_content' , $explicit_content); + DI::config()->set('system', 'proxify_content' , $proxify_content); DI::config()->set('system', 'check_new_version_url' , $check_new_version_url); DI::config()->set('system', 'block_extended_register', !$enable_multi_reg); @@ -551,6 +553,7 @@ class Site extends BaseAdmin '$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.')], + '$proxify_content' => ['proxify_content', DI::l10n()->t('Proxify external content'), DI::config()->get('system', 'proxify_content'), DI::l10n()->t('Redirect external content via the proxy functionality. This is used for example for some OEmbed accesses and in some other rare cases.')], '$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.')], '$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.')], diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php index cd11d9e3ab..15ef1c4412 100644 --- a/src/Module/Proxy.php +++ b/src/Module/Proxy.php @@ -24,6 +24,7 @@ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Core\Logger; use Friendica\Core\System; +use Friendica\DI; use Friendica\Object\Image; use Friendica\Util\HTTPSignature; use Friendica\Util\Images; @@ -44,6 +45,13 @@ class Proxy extends BaseModule */ public static function rawContent(array $parameters = []) { + $request = self::getRequestInfo($parameters); + + if (!DI::config()->get('system', 'proxify_content')) { + Logger::notice('Proxy access is forbidden', ['request' => $request, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'accept' => $_SERVER['HTTP_ACCEPT'] ?? '']); + throw new \Friendica\Network\HTTPException\NotFoundException(); + } + if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) { header("HTTP/1.1 304 Not Modified"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); @@ -60,8 +68,6 @@ class Proxy extends BaseModule exit; } - $request = self::getRequestInfo($parameters); - if (empty($request['url'])) { throw new \Friendica\Network\HTTPException\BadRequestException(); } diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php index 443725a3d8..2748090000 100644 --- a/src/Util/Proxy.php +++ b/src/Util/Proxy.php @@ -82,6 +82,10 @@ class Proxy */ public static function proxifyUrl($url, $size = '') { + if (!DI::config()->get('system', 'proxify_content')) { + return $url; + } + // Trim URL first $url = trim($url); diff --git a/static/defaults.config.php b/static/defaults.config.php index b405d5f5e4..0d25a1751a 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -429,10 +429,6 @@ return [ // Enable internal timings to help optimize code. Needed for "rendertime" addon. 'profiler' => false, - // proxy_cache_time (Integer) - // Period in seconds after which the cache is cleared. - 'proxy_cache_time' => 86400, - // pushpoll_frequency (Integer) // Frequency of contact poll for subhub contact using the DFRM or OStatus network. // Available values: diff --git a/static/settings.config.php b/static/settings.config.php index 53a00562db..5d9b430b19 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -164,6 +164,10 @@ return [ // Comma separated list of tags that are rejected. 'relay_deny_tags' => '', + // proxify_content (Boolean) + // Use the proxy functionality for fetching external content + 'proxify_content' => true, + // relay_directly (Boolean) // Directly transmit content to relay subscribers without using a relay server 'relay_directly' => false, diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 1294927b2a..4b4480d465 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2021.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-06 12:45-0400\n" +"POT-Creation-Date: 2021-09-09 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1029,7 +1029,7 @@ msgstr "" msgid "Basic" msgstr "" -#: mod/events.php:582 src/Module/Admin/Site.php:503 src/Module/Contact.php:916 +#: mod/events.php:582 src/Module/Admin/Site.php:505 src/Module/Contact.php:916 #: src/Module/Profile/Profile.php:249 msgid "Advanced" msgstr "" @@ -1866,7 +1866,7 @@ msgstr "" #: mod/settings.php:482 mod/settings.php:575 mod/settings.php:712 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87 -#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:498 +#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:500 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:194 msgid "Save Settings" @@ -5049,7 +5049,7 @@ msgstr "" #: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80 #: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72 -#: src/Module/Admin/Site.php:495 src/Module/Admin/Storage.php:131 +#: src/Module/Admin/Site.php:497 src/Module/Admin/Storage.php:131 #: src/Module/Admin/Summary.php:232 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58 #: src/Module/Admin/Users/Active.php:136 src/Module/Admin/Users/Blocked.php:137 @@ -5603,464 +5603,464 @@ msgstr "" msgid "Relocation started. Could take a while to complete." msgstr "" -#: src/Module/Admin/Site.php:400 src/Module/Settings/Display.php:139 +#: src/Module/Admin/Site.php:402 src/Module/Settings/Display.php:139 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:417 src/Module/Settings/Display.php:149 +#: src/Module/Admin/Site.php:419 src/Module/Settings/Display.php:149 #, php-format msgid "%s - (Experimental)" msgstr "" -#: src/Module/Admin/Site.php:429 +#: src/Module/Admin/Site.php:431 msgid "No community page for local users" msgstr "" -#: src/Module/Admin/Site.php:430 +#: src/Module/Admin/Site.php:432 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:431 +#: src/Module/Admin/Site.php:433 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:432 +#: src/Module/Admin/Site.php:434 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:433 +#: src/Module/Admin/Site.php:435 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:439 +#: src/Module/Admin/Site.php:441 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:466 +#: src/Module/Admin/Site.php:468 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:467 +#: src/Module/Admin/Site.php:469 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:468 +#: src/Module/Admin/Site.php:470 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:472 src/Module/Install.php:215 +#: src/Module/Admin/Site.php:474 src/Module/Install.php:215 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: src/Module/Admin/Site.php:473 src/Module/Install.php:216 +#: src/Module/Admin/Site.php:475 src/Module/Install.php:216 msgid "Force all links to use SSL" msgstr "" -#: src/Module/Admin/Site.php:474 src/Module/Install.php:217 +#: src/Module/Admin/Site.php:476 src/Module/Install.php:217 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Site.php:480 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:481 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:482 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:484 +#: src/Module/Admin/Site.php:486 msgid "none" msgstr "" -#: src/Module/Admin/Site.php:485 +#: src/Module/Admin/Site.php:487 msgid "Local contacts" msgstr "" -#: src/Module/Admin/Site.php:486 +#: src/Module/Admin/Site.php:488 msgid "Interactors" msgstr "" -#: src/Module/Admin/Site.php:496 src/Module/BaseAdmin.php:90 +#: src/Module/Admin/Site.php:498 src/Module/BaseAdmin.php:90 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:497 +#: src/Module/Admin/Site.php:499 msgid "General Information" msgstr "" -#: src/Module/Admin/Site.php:499 +#: src/Module/Admin/Site.php:501 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:500 src/Module/Register.php:139 +#: src/Module/Admin/Site.php:502 src/Module/Register.php:139 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:503 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:504 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:506 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:507 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:508 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:509 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:510 msgid "" "Use the command \"console relay\" in the command line to add or remove " "relays." msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:511 msgid "The system is not subscribed to any relays at the moment." msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:512 msgid "The system is currently subscribed to the following relays:" msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:514 msgid "Relocate Instance" msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:515 msgid "" "Warning! Advanced function. Could make this server " "unreachable." msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:519 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:520 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:520 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:521 msgid "Name of the system actor" msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:521 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:520 +#: src/Module/Admin/Site.php:522 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:523 msgid "Email Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:524 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:524 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:525 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:525 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:526 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:526 #, 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:525 +#: src/Module/Admin/Site.php:527 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:528 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:528 msgid "" "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:529 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:529 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:528 src/Module/Install.php:225 +#: src/Module/Admin/Site.php:530 src/Module/Install.php:225 msgid "SSL link policy" msgstr "" -#: src/Module/Admin/Site.php:528 src/Module/Install.php:227 +#: src/Module/Admin/Site.php:530 src/Module/Install.php:227 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:531 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:531 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:532 msgid "Show help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:532 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:531 +#: src/Module/Admin/Site.php:533 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:531 +#: src/Module/Admin/Site.php:533 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:535 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:535 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:536 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:536 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:535 +#: src/Module/Admin/Site.php:537 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:535 +#: src/Module/Admin/Site.php:537 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:537 +#: src/Module/Admin/Site.php:539 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:540 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:540 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:539 +#: src/Module/Admin/Site.php:541 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:539 +#: src/Module/Admin/Site.php:541 msgid "" "Will be displayed prominently on the registration page. You can use BBCode " "here." msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:542 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:542 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:541 +#: src/Module/Admin/Site.php:543 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:543 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:542 +#: src/Module/Admin/Site.php:544 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:542 +#: src/Module/Admin/Site.php:544 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:543 +#: src/Module/Admin/Site.php:545 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:545 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:544 +#: src/Module/Admin/Site.php:546 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:546 msgid "" "Don't show the rich content (e.g. embedded PDF), except from the domains " "listed below." msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:547 msgid "Trusted third-party domains" msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:547 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:546 +#: src/Module/Admin/Site.php:548 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:546 +#: src/Module/Admin/Site.php:548 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:547 +#: src/Module/Admin/Site.php:549 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:549 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:549 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:550 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:550 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:549 +#: src/Module/Admin/Site.php:551 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:551 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:552 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:552 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:551 +#: src/Module/Admin/Site.php:553 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:553 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:554 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:554 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:553 +#: src/Module/Admin/Site.php:555 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:555 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 " @@ -6069,235 +6069,245 @@ msgid "" "will be shown at the user registration page." msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:556 +msgid "Proxify external content" +msgstr "" + +#: src/Module/Admin/Site.php:556 +msgid "" +"Redirect external content via the proxy functionality. This is used for " +"example for some OEmbed accesses and in some other rare cases." +msgstr "" + +#: src/Module/Admin/Site.php:557 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:557 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:555 +#: src/Module/Admin/Site.php:558 msgid "Enable multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:558 msgid "Enable users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:559 msgid "Enable OpenID" msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:559 msgid "Enable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:560 msgid "Enable Fullname check" msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:560 msgid "" "Enable check to only allow users to register with a space between the first " "name and the last name in their full name." msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:561 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:561 msgid "" "Which community pages should be available for visitors. Local users always " "see both pages." msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:562 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:562 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "\"Global Community\")" msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:564 msgid "Enable Mail support" msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:564 msgid "" "Enable built-in mail support to poll IMAP folders and to reply via mail." msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:565 msgid "" "Mail support can't be enabled because the PHP IMAP module is not installed." msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:566 msgid "Enable OStatus support" msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:566 msgid "" "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public." msgstr "" -#: src/Module/Admin/Site.php:565 +#: src/Module/Admin/Site.php:568 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:569 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:569 msgid "" "Enable built-in Diaspora network compatibility for communicating with " "diaspora servers." msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:570 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:570 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:568 +#: src/Module/Admin/Site.php:571 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:572 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:573 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:573 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:574 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:574 #, php-format msgid "" "Maximum system load before delivery and poll processes are deferred - " "default %d." msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:575 msgid "Maximum Load Average (Frontend)" msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:575 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:576 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:576 msgid "" "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:577 msgid "Periodically optimize tables" msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:577 msgid "Periodically optimize tables like the cache and the workerqueue" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:579 msgid "Discover followers/followings from contacts" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:579 msgid "" "If enabled, contacts are checked for their followers and following contacts." msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:580 msgid "None - deactivated" msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:581 msgid "" "Local contacts - contacts of our local contacts are discovered for their " "followers/followings." msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:582 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:581 +#: src/Module/Admin/Site.php:584 msgid "Synchronize the contacts with the directory server" msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:584 msgid "" "if enabled, the system will check periodically for new contacts on the " "defined directory server." msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:586 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:586 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:587 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:587 msgid "" "Periodically query other servers for contacts. The system queries Friendica, " "Mastodon and Hubzilla servers." msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:588 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:588 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:587 +#: src/Module/Admin/Site.php:590 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:590 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 " @@ -6305,50 +6315,50 @@ msgid "" "href=\"http://the-federation.info/\">the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:592 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:592 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:590 +#: src/Module/Admin/Site.php:593 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:590 +#: src/Module/Admin/Site.php:593 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:594 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:594 msgid "" "Remove old remote items, orphaned database records and old content from some " "other helper tables." msgstr "" -#: src/Module/Admin/Site.php:592 +#: src/Module/Admin/Site.php:595 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:592 +#: src/Module/Admin/Site.php:595 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:593 +#: src/Module/Admin/Site.php:596 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:596 msgid "" "When the database cleanup is enabled, this defines the days after which " "unclaimed remote items (mostly content from the relay) will be deleted. " @@ -6356,144 +6366,144 @@ msgid "" "items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:597 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:597 msgid "" "The conversation data is used for ActivityPub and OStatus, 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:595 +#: src/Module/Admin/Site.php:598 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:598 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:599 msgid "Maximum numbers of comments per post on the display page" msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:599 msgid "" "How many comments should be shown on the single view for each post? Default " "value is 1000." msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:600 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:600 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:598 +#: src/Module/Admin/Site.php:601 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:598 +#: src/Module/Admin/Site.php:601 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:603 msgid "New base url" msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:603 msgid "" "Change base url for this server. Sends relocate message to all Friendica and " "Diaspora* contacts of all users." msgstr "" -#: src/Module/Admin/Site.php:602 +#: src/Module/Admin/Site.php:605 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:602 +#: src/Module/Admin/Site.php:605 #, 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:603 +#: src/Module/Admin/Site.php:606 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:603 +#: src/Module/Admin/Site.php:606 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:605 +#: src/Module/Admin/Site.php:608 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:605 +#: src/Module/Admin/Site.php:608 msgid "" "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:609 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:609 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:606 src/Module/Contact.php:516 +#: src/Module/Admin/Site.php:609 src/Module/Contact.php:516 #: src/Module/Settings/TwoFactor/Index.php:118 msgid "Disabled" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:609 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:609 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:610 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:610 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:608 +#: src/Module/Admin/Site.php:611 msgid "Deny Server tags" msgstr "" -#: src/Module/Admin/Site.php:608 +#: src/Module/Admin/Site.php:611 msgid "Comma separated list of tags that are rejected." msgstr "" -#: src/Module/Admin/Site.php:609 +#: src/Module/Admin/Site.php:612 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:609 +#: src/Module/Admin/Site.php:612 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:612 +#: src/Module/Admin/Site.php:615 msgid "Start Relocation" msgstr "" diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 2b181ce18a..72fba2b804 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -83,6 +83,7 @@ {{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} {{include file="field_checkbox.tpl" field=$explicit_content}} + {{include file="field_checkbox.tpl" field=$proxify_content}}

{{$advanced}}

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 18d702a339..f043ea8edf 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -164,6 +164,7 @@ {{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} {{include file="field_checkbox.tpl" field=$explicit_content}} + {{include file="field_checkbox.tpl" field=$proxify_content}}