Changes:

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

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 11cecac44da3d8a1510b4116016986015f6e455d..417f503b8fa20d3a846cfd5e4c73ef6b3d1e6847 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,6 +27,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Content\Text\BBCode;
+use Friendica\Model\User;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
@@ -83,22 +84,24 @@ class Tos extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate('tos.tpl');
                if ($this->config->get('system', 'tosdisplay')) {
-                       $lines = $this->config->get('system', 'tosrules');
-                       if (!empty($lines)) {
-                               $rules = "[list=1]";
+                       $lines = trim($this->config->get('system', 'tosrules') ?: '');
+                       if ($lines) {
+                               $rules = "[ol]";
                                foreach (explode("\n", $lines) as $line) {
-                                       $rules .= "\n[*]" . $line;
+                                       if (trim($line)) {
+                                               $rules .= "\n[*]" . trim($line);
+                                       }
                                }
-                               $rules .= "\n[/list]\n";
+                               $rules .= "\n[/ol]\n";
                        } else {
                                $rules = '';
                        }
 
                        return Renderer::replaceMacros($tpl, [
                                '$title'                => $this->t('Terms of Service'),
-                               '$tostext'              => BBCode::convert($this->config->get('system', 'tostext')),
+                               '$tostext'              => BBCode::convertForUriId(User::getSystemUriId(), $this->config->get('system', 'tostext')),
                                '$rulestitle'           => $this->t('Rules'),
-                               '$rules'                => BBCode::convert($rules),
+                               '$rules'                => BBCode::convertForUriId(User::getSystemUriId(), $rules),
                                '$displayprivstatement' => $this->config->get('system', 'tosprivstatement'),
                                '$privstatementtitle'   => $this->t('Privacy Statement'),
                                '$privacy_operate'      => $this->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'),