Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 00:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into commperms

Browse source
This commit is contained in:
Mike Macgirvin 2022-12-21 07:33:43 +11:00
commit 7ea4d9d6be
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Code/Lib/Activity.php
View file

@ -2621,7 +2621,7 @@ class Activity
$multi = false;
$mid = $post['mid'];
$content = $post['title'];
$content = trim($post['title']);
if (!$item) {
return false;
@ -2643,7 +2643,7 @@ class Activity
if ($r) {
if ($multi) {
foreach ($r as $rv) {
if ($rv['title'] === $content && $rv['mid'] !== $mid) {
if (trim($rv['title']) === $content && $rv['mid'] !== $mid) {
return false;
}
}
@ -2660,7 +2660,7 @@ class Activity
$found = false;
if ($multi) {
for ($c = 0; $c < count($o['anyOf']); $c++) {
if ($o['anyOf'][$c]['name'] === $content) {
if (trim($o['anyOf'][$c]['name']) === $content) {
$answer_found = true;
if (is_array($o['anyOf'][$c]['replies'])) {
foreach ($o['anyOf'][$c]['replies'] as $reply) {
@ -2678,7 +2678,7 @@ class Activity
}
} else {
for ($c = 0; $c < count($o['oneOf']); $c++) {
if ($o['oneOf'][$c]['name'] === $content) {
if (trim($o['oneOf'][$c]['name']) === $content) {
$answer_found = true;
if (is_array($o['oneOf'][$c]['replies'])) {
foreach ($o['oneOf'][$c]['replies'] as $reply) {

2
Code/Module/Item.php
View file

@ -2043,7 +2043,7 @@ class Item extends Controller
foreach ($answers as $answer) {
if (trim($answer)) {
$ptr[] = ['name' => escape_tags($answer), 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]];
$ptr[] = ['name' => escape_tags(trim($answer)), 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]];
}
}

6
Code/Module/Vote.php
View file

@ -27,7 +27,7 @@ class Vote extends Controller
$fetch = null;
$id = argv(1);
$response = $_REQUEST['answer'];
$response = trim($_REQUEST['answer']);
if ($id) {
$fetch = q(
@ -49,7 +49,7 @@ class Vote extends Controller
foreach ($obj['oneOf'] as $selection) {
// logger('selection: ' . '"' . $selection['name'] . '"');
// logger('response: ' . '"' . $response . '"');
if ($selection['name'] && trim($selection['name']) === trim($response)) {
if ($selection['name'] && trim($selection['name']) === $response) {
$valid = true;
}
}
@ -58,7 +58,7 @@ class Vote extends Controller
$choices = [];
if ($obj['anyOf']) {
foreach ($obj['anyOf'] as $selection) {
$choices[] = $selection['name'];
$choices[] = trim($selection['name']);
}
foreach ($response as $res) {
if (!in_array($res, $choices)) {