Remove system.no_auto_update personal config key and assume default value of true

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

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 31beb665155e9317ce8910f4f6b3cab80fe20bcc..af64810086b77cbc4016ba2601f7222b00f73b09 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-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -77,15 +77,30 @@ class Tos extends BaseModule
         */
        protected function content(array $request = []): string
        {
-               if (strlen($this->config->get('system', 'singleuser'))) {
+               if ($this->config->get('system', 'singleuser')) {
                        $this->baseUrl->redirect('profile/' . $this->config->get('system', 'singleuser'));
                }
 
                $tpl = Renderer::getMarkupTemplate('tos.tpl');
                if ($this->config->get('system', 'tosdisplay')) {
+                       $lines = trim($this->config->get('system', 'tosrules') ?: '');
+                       if ($lines) {
+                               $rules = "[ol]";
+                               foreach (explode("\n", $lines) as $line) {
+                                       if (trim($line)) {
+                                               $rules .= "\n[*]" . trim($line);
+                                       }
+                               }
+                               $rules .= "\n[/ol]\n";
+                       } else {
+                               $rules = '';
+                       }
+
                        return Renderer::replaceMacros($tpl, [
                                '$title'                => $this->t('Terms of Service'),
                                '$tostext'              => BBCode::convert($this->config->get('system', 'tostext')),
+                               '$rulestitle'           => $this->t('Rules'),
+                               '$rules'                => BBCode::convert($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.'),