Move path determination logic into the `ConfigFactory`

[friendica.git] / src / Module / Admin / Site.php

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index f3ab67f9810c87100ead1e292e0ba5ac42d73602..5819627453773524e1c0a2821f8f55d5b1c2977b 100644 (file)
--- 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']);
@@ -199,7 +200,6 @@ class Site extends BaseAdmin
                $temppath               = (!empty($_POST['temppath'])               ? Strings::escapeTags(trim($_POST['temppath']))   : '');
                $singleuser             = (!empty($_POST['singleuser'])             ? Strings::escapeTags(trim($_POST['singleuser'])) : '');
                $only_tag_search        = !empty($_POST['only_tag_search']);
-               $rino                   = (!empty($_POST['rino'])                   ? intval($_POST['rino'])                          : 0);
                $check_new_version_url  = (!empty($_POST['check_new_version_url'])  ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none');
 
                $worker_queues    = (!empty($_POST['worker_queues'])                ? intval($_POST['worker_queues'])                 : 10);
@@ -329,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);
@@ -379,8 +380,6 @@ class Site extends BaseAdmin
                DI::config()->set('system', 'relay_deny_tags'  , $relay_deny_tags);
                DI::config()->set('system', 'relay_user_tags'  , $relay_user_tags);
 
-               DI::config()->set('system', 'rino_encrypt'     , $rino);
-
                DI::baseUrl()->redirect('admin/site' . $active_panel);
        }
 
@@ -554,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('Route 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.')],
@@ -602,8 +602,6 @@ class Site extends BaseAdmin
 
                        '$relocate_url'           => ['relocate_url', DI::l10n()->t('New base url'), DI::baseUrl()->get(), DI::l10n()->t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')],
 
-                       '$rino'                   => ['rino', DI::l10n()->t('RINO Encryption'), intval(DI::config()->get('system', 'rino_encrypt')), DI::l10n()->t('Encryption layer between nodes.'), [0 => DI::l10n()->t('Disabled'), 1 => DI::l10n()->t('Enabled')]],
-
                        '$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_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.')],