X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FTos.php;h=af64810086b77cbc4016ba2601f7222b00f73b09;hb=8038c1b04ffa723ebd28610fb72927d8d21b3577;hp=c26085b48bb2e9fdbbe5adaef26f0f6e9cdcce31;hpb=b543ee8ac78168328c7a7f2d725ee01bb333e941;p=friendica.git
diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index c26085b48b..af64810086 100644
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -1,19 +1,34 @@
.
*
- * This module displays the Terms of Service for a node, if the admin
- * wants them to be displayed.
*/
namespace Friendica\Module;
+use Friendica\App;
use Friendica\BaseModule;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\Content\Text\BBCode;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
class Tos extends BaseModule
{
@@ -23,39 +38,33 @@ class Tos extends BaseModule
public $privacy_delete;
public $privacy_complete;
+ /** @var IManageConfigValues */
+ protected $config;
+
/**
- * @brief constructor for the module, initializing the text variables
+ * constructor for the module, initializing the text variables
*
* To make the text variables available outside of the module, they need to
* be properties of the class, however cannot be set directly as the property
* cannot depend on a function result when declaring the variable.
**/
- public function __construct()
+ public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
{
- $this->privacy_operate = L10n::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.');
- $this->privacy_distribute = L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
- $this->privacy_delete = L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl());
+ parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+ $this->config = $config;
+
+ $this->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.');
+ $this->privacy_distribute = $this->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
+ $this->privacy_delete = $this->t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', $this->baseUrl);
// In some cases we don't need every single one of the above separate, but all in one block.
// So here is an array to look over
- $this->privacy_complete = [L10n::t('Privacy Statement'), $this->privacy_operate, $this->privacy_distribute, $this->privacy_delete];
+ $this->privacy_complete = [$this->t('Privacy Statement'), $this->privacy_operate,
+ $this->privacy_distribute, $this->privacy_delete];
}
/**
- * @brief initialize the TOS module.
- *
- * If this is a single user instance, we expect the user to know their
- * dealings with their own node so a TOS is not necessary.
- *
- **/
- public static function init()
- {
- if (strlen(Config::get('system','singleuser'))) {
- self::getApp()->internalRedirect('profile/' . Config::get('system','singleuser'));
- }
- }
-
- /**
- * @brief generate the content of the /tos page
+ * generate the content of the /tos page
*
* The content of the /tos page is generated from two parts.
* (1) a free form part the admin of the node can set in the admin panel
@@ -66,20 +75,40 @@ class Tos extends BaseModule
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function content() {
+ protected function content(array $request = []): string
+ {
+ if ($this->config->get('system', 'singleuser')) {
+ $this->baseUrl->redirect('profile/' . $this->config->get('system', 'singleuser'));
+ }
+
$tpl = Renderer::getMarkupTemplate('tos.tpl');
- if (Config::get('system', 'tosdisplay')) {
+ 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' => L10n::t('Terms of Service'),
- '$tostext' => BBCode::convert(Config::get('system', 'tostext')),
- '$displayprivstatement' => Config::get('system', 'tosprivstatement'),
- '$privstatementtitle' => L10n::t('Privacy Statement'),
- '$privacy_operate' => L10n::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.'),
- '$privacy_distribute' => L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'),
- '$privacy_delete' => L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl())
+ '$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.'),
+ '$privacy_distribute' => $this->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'),
+ '$privacy_delete' => $this->t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', $this->baseUrl)
]);
} else {
- return;
+ return '';
}
}
}