Merge pull request #12922 from annando/nomad-version

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

diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index a42427e9029adaba7a5d1501a3a7ba74f4abd34b..82377ed66616fb3b3bad33c5669ab08ce4f81960 100644 (file)
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,11 +21,14 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\App\BaseURL;
+use Friendica\App;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Module\BaseAdmin;
+use Friendica\Module\Response;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class Tos extends BaseAdmin
 {
@@ -33,19 +36,16 @@ class Tos extends BaseAdmin
        protected $tos;
        /** @var IManageConfigValues */
        protected $config;
-       /** @var BaseURL */
-       protected $baseUrl;
 
-       public function __construct(\Friendica\Module\Tos $tos, IManageConfigValues $config, BaseURL $baseUrl, L10n $l10n, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->tos     = $tos;
+               $this->tos     = new \Friendica\Module\Tos($l10n, $baseUrl, $args, $logger, $profiler, $response, $config, $server, $parameters);
                $this->config  = $config;
-               $this->baseUrl = $baseUrl;
        }
 
-       public function post()
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 
@@ -57,30 +57,33 @@ class Tos extends BaseAdmin
 
                $displaytos = !empty($_POST['displaytos']);
                $displayprivstatement = !empty($_POST['displayprivstatement']);
-               $tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : '');
+               $tostext  = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : '');
+               $tosrules = (!empty($_POST['tosrules']) ? strip_tags(trim($_POST['tosrules'])) : '');
 
                $this->config->set('system', 'tosdisplay', $displaytos);
                $this->config->set('system', 'tosprivstatement', $displayprivstatement);
                $this->config->set('system', 'tostext', $tostext);
+               $this->config->set('system', 'tosrules', $tosrules);
 
                $this->baseUrl->redirect('admin/tos');
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                parent::content();
 
                $t = Renderer::getMarkupTemplate('admin/tos.tpl');
                return Renderer::replaceMacros($t, [
-                       '$title' => $this->l10n->t('Administration'),
-                       '$page' => $this->l10n->t('Terms of Service'),
-                       '$displaytos' => ['displaytos', $this->l10n->t('Display Terms of Service'), $this->config->get('system', 'tosdisplay'), $this->l10n->t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
-                       '$displayprivstatement' => ['displayprivstatement', $this->l10n->t('Display Privacy Statement'), $this->config->get('system', 'tosprivstatement'), $this->l10n->t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank" rel="noopener noreferrer">EU-GDPR</a>.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
-                       '$preview' => $this->l10n->t('Privacy Statement Preview'),
+                       '$title' => $this->t('Administration'),
+                       '$page' => $this->t('Terms of Service'),
+                       '$displaytos' => ['displaytos', $this->t('Display Terms of Service'), $this->config->get('system', 'tosdisplay'), $this->t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
+                       '$displayprivstatement' => ['displayprivstatement', $this->t('Display Privacy Statement'), $this->config->get('system', 'tosprivstatement'), $this->t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank" rel="noopener noreferrer">EU-GDPR</a>.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
+                       '$preview' => $this->t('Privacy Statement Preview'),
                        '$privtext' => $this->tos->privacy_complete,
-                       '$tostext' => ['tostext', $this->l10n->t('The Terms of Service'), $this->config->get('system', 'tostext'), $this->l10n->t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
+                       '$tostext' => ['tostext', $this->t('The Terms of Service'), $this->config->get('system', 'tostext'), $this->t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
+                       '$tosrules' => ['tosrules', $this->t('The rules'), $this->config->get('system', 'tosrules'), $this->t('Enter your system rules here. Each line represents one rule.')],
                        '$form_security_token' => self::getFormSecurityToken('admin_tos'),
-                       '$submit' => $this->l10n->t('Save Settings'),
+                       '$submit' => $this->t('Save Settings'),
                ]);
        }
 }