Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 17:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Trim terms of service rules before turning them to an array

Browse source
This commit is contained in:
Hypolite Petovan 2022-12-17 21:13:24 -05:00
parent 9a8f6f2150
commit 43aa9cddc5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/System.php
View file

@ -678,7 +678,7 @@ class System
$html = BBCode::convert($rulelist, false, BBCode::EXTERNAL); $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL);
$msg = HTML::toPlaintext($html, 0, true); $msg = HTML::toPlaintext($html, 0, true);
foreach (explode("\n", $msg) as $line) { foreach (explode("\n", trim($msg)) as $line) {
$line = trim($line); $line = trim($line);
if ($line) { if ($line) {
$rules[] = ['id' => (string)++$id, 'text' => $line]; $rules[] = ['id' => (string)++$id, 'text' => $line];

4
src/Module/Tos.php
View file

@ -83,8 +83,8 @@ class Tos extends BaseModule
$tpl = Renderer::getMarkupTemplate('tos.tpl'); $tpl = Renderer::getMarkupTemplate('tos.tpl');
if ($this->config->get('system', 'tosdisplay')) { if ($this->config->get('system', 'tosdisplay')) {
$lines = $this->config->get('system', 'tosrules'); $lines = trim($this->config->get('system', 'tosrules') ?: '');
if (!empty($lines)) { if ($lines) {
$rules = "[list=1]"; $rules = "[list=1]";
foreach (explode("\n", $lines) as $line) { foreach (explode("\n", $lines) as $line) {
$rules .= "\n[*]" . $line; $rules .= "\n[*]" . $line;