Skip to content
Snippets Groups Projects
Commit aefa4f42 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

prevent php8 warnings, fixes #2275

Closes #2275

Merge request studip/studip!1500
parent 3ef173d6
No related branches found
No related tags found
No related merge requests found
...@@ -281,13 +281,12 @@ class QuestionnaireController extends AuthenticatedController ...@@ -281,13 +281,12 @@ class QuestionnaireController extends AuthenticatedController
object_set_visit($questionnaire_id, 'vote'); object_set_visit($questionnaire_id, 'vote');
PageLayout::setTitle(sprintf(_("Fragebogen: %s"), $this->questionnaire->title)); PageLayout::setTitle(sprintf(_("Fragebogen: %s"), $this->questionnaire->title));
$this->filtered = [];
if (Request::submitted('filtered')) { if (Request::submitted('filtered')) {
$this->filtered = [ $this->filtered[$questionnaire_id] = Request::getArray('filtered');
$questionnaire_id => Request::getArray('filtered')
];
} }
if (Request::isAjax() && !$_SERVER['HTTP_X_DIALOG']) { if (Request::isAjax() && empty($_SERVER['HTTP_X_DIALOG'])) {
PageLayout::clearMessages(); PageLayout::clearMessages();
} }
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<? if ($feedback->commentable) : ?> <? if ($feedback->commentable) : ?>
<label> <label>
<?= _('Kommentar') ?> <?= _('Kommentar') ?>
<textarea name="comment"><?= htmlReady($entry->comment) ?></textarea> <textarea name="comment"><?= htmlReady(isset($entry) ? $entry->comment : '') ?></textarea>
</label> </label>
<? endif; ?> <? endif; ?>
<div> <div>
......
<? <?php
/** /**
* @var Questionnaire $questionnaire * @var Questionnaire $questionnaire
* @var array $filtered * @var array $filtered
*/ */
$only_user_ids = null; $only_user_ids = null;
if ($filtered[$questionnaire->getId()] && $filtered[$questionnaire->getId()]['question_id']) { if (isset($filtered[$questionnaire->getId()]) && $filtered[$questionnaire->getId()]['question_id']) {
foreach ($questionnaire->questions as $question) { foreach ($questionnaire->questions as $question) {
if ($question->getId() === $filtered[$questionnaire->getId()]['question_id']) { if ($question->getId() === $filtered[$questionnaire->getId()]['question_id']) {
$only_user_ids = $question->getUserIdsOfFilteredAnswer($filtered[$questionnaire->getId()]['filterForAnswer']); $only_user_ids = $question->getUserIdsOfFilteredAnswer($filtered[$questionnaire->getId()]['filterForAnswer']);
...@@ -21,7 +21,13 @@ if ($filtered[$questionnaire->getId()] && $filtered[$questionnaire->getId()]['qu ...@@ -21,7 +21,13 @@ if ($filtered[$questionnaire->getId()] && $filtered[$questionnaire->getId()]['qu
<? if ($questionnaire->resultsVisible()) : ?> <? if ($questionnaire->resultsVisible()) : ?>
<? foreach ($questionnaire->questions as $question) : ?> <? foreach ($questionnaire->questions as $question) : ?>
<article class="question question_<?= $question->getId() ?>"> <article class="question question_<?= $question->getId() ?>">
<? $template = $question->getResultTemplate($only_user_ids, $filtered[$questionnaire->getId()]['question_id'] === $question->getId() ? $filtered[$questionnaire->getId()]['filterForAnswer'] : null) ?> <? $template = $question->getResultTemplate(
$only_user_ids,
(
isset($filtered[$questionnaire->getId()]['question_id'])
&& $filtered[$questionnaire->getId()]['question_id'] === $question->getId()
) ? $filtered[$questionnaire->getId()]['filterForAnswer'] : null
) ?>
<?= $template ? $template->render(['anonAnswers' => $anonAnswers ?? '']) : _("Ergebnisse konnten nicht ausgewertet werden.") ?> <?= $template ? $template->render(['anonAnswers' => $anonAnswers ?? '']) : _("Ergebnisse konnten nicht ausgewertet werden.") ?>
</article> </article>
<? endforeach ?> <? endforeach ?>
......
...@@ -94,13 +94,13 @@ rsort($ordered_results); ...@@ -94,13 +94,13 @@ rsort($ordered_results);
<a href="" <a href=""
onclick="STUDIP.Questionnaire.addFilter('<?= htmlReady($vote['questionnaire_id']) ?>', '<?= htmlReady($vote->getId()) ?>', '<?= $key ?>'); return false;" onclick="STUDIP.Questionnaire.addFilter('<?= htmlReady($vote['questionnaire_id']) ?>', '<?= htmlReady($vote->getId()) ?>', '<?= $key ?>'); return false;"
title="<?= _('Zeige nur Ergebnisse von Personen an, die diese Option gewählt haben.') ?>"> title="<?= _('Zeige nur Ergebnisse von Personen an, die diese Option gewählt haben.') ?>">
(<?= $percentage ?>% | <?= (int) $results[$key] ?>/<?= $countAnswers ?>) (<?= $percentage ?>% | <?= (int) ($results[$key] ?? 0) ?>/<?= $countAnswers ?>)
</a> </a>
<? endif ?> <? endif ?>
</td> </td>
<td width="50%"> <td width="50%">
<? if (!$vote->questionnaire['anonymous'] && $results[$key]) : ?> <? if (empty($vote->questionnaire['anonymous']) && !empty($results[$key])) : ?>
<? $users = SimpleCollection::createFromArray( <? $users = SimpleCollection::createFromArray(
User::findMany($results_users[$key])); ?> User::findMany($results_users[$key])); ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment