X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAdmin%2FSite.php;h=2bac3d79edf76532c9b97ce6def3fc55f833bcd1;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=be72184cb750d05e20fb2b0f570da4064a468762;hpb=8185c591d8fb3a79869356a29f2e31be27867d88;p=friendica.git diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index be72184cb7..2bac3d79ed 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -1,6 +1,6 @@ get('system', 'directory') && ($global_directory != '')) { @@ -263,7 +263,6 @@ class Site extends BaseAdmin } DI::config()->set('system', 'ssl_policy' , $ssl_policy); DI::config()->set('system', 'maxloadavg' , $maxloadavg); - DI::config()->set('system', 'maxloadavg_frontend' , $maxloadavg_frontend); DI::config()->set('system', 'min_memory' , $min_memory); DI::config()->set('system', 'optimize_tables' , $optimize_tables); DI::config()->set('system', 'contact_discovery' , $contact_discovery); @@ -331,7 +330,7 @@ class Site extends BaseAdmin 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', 'cache_contact_avatar' , $cache_contact_avatar); + DI::config()->set('system', 'cache_contact_avatar' , $cache_contact_avatar); DI::config()->set('system', 'check_new_version_url' , $check_new_version_url); DI::config()->set('system', 'block_extended_register', !$enable_multi_reg); @@ -385,9 +384,9 @@ class Site extends BaseAdmin DI::baseUrl()->redirect('admin/site' . $active_panel); } - public static function content(array $parameters = []) + protected function content(array $request = []): string { - parent::content($parameters); + parent::content(); /* Installed langs */ $lang_choices = DI::l10n()->getAvailableLanguages(); @@ -463,7 +462,7 @@ class Site extends BaseAdmin $additional_info = DI::config()->get('config', 'info'); // Automatically create temporary paths - get_temppath(); + System::getTempPath(); /* Register policy */ $register_choices = [ @@ -575,7 +574,6 @@ class Site extends BaseAdmin '$proxy' => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), ''], '$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)], - '$maxloadavg_frontend' => ['maxloadavg_frontend', DI::l10n()->t('Maximum Load Average (Frontend)'), DI::config()->get('system', 'maxloadavg_frontend'), DI::l10n()->t('Maximum system load before the frontend quits service - default 50.')], '$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')], @@ -609,7 +607,7 @@ class Site extends BaseAdmin '$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.')], '$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.'), [SR_SCOPE_NONE => DI::l10n()->t('Disabled'), SR_SCOPE_ALL => DI::l10n()->t('all'), SR_SCOPE_TAGS => DI::l10n()->t('tags')]], + '$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')]], '$relay_server_tags' => ['relay_server_tags', DI::l10n()->t('Server tags'), DI::config()->get('system', 'relay_server_tags'), DI::l10n()->t('Comma separated list of tags for the "tags" subscription.')], '$relay_deny_tags' => ['relay_deny_tags', DI::l10n()->t('Deny Server tags'), DI::config()->get('system', 'relay_deny_tags'), DI::l10n()->t('Comma separated list of tags that are rejected.')], '$relay_user_tags' => ['relay_user_tags', DI::l10n()->t('Allow user tags'), DI::config()->get('system', 'relay_user_tags'), DI::l10n()->t('If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".')],